Merge "Defer the Surface.show until animation phase."

Author: Craig Mautner

services/java/com/android/server/wm/WindowStateAnimator.java

@@ -978,7 +978,7 @@ public void prepareSurfaceLocked(final boolean recoveringMemory) {
 
         setSurfaceBoundaries(recoveringMemory);
 
-        if (w.mAttachedHidden || !w.isReadyForDisplay() || !w.isDrawnLw()) {
+        if (w.mAttachedHidden || !w.isReadyForDisplay()) {
             if (!mLastHidden) {
                 //dump();
                 mLastHidden = true;
@@ -1136,17 +1136,15 @@ boolean performShowLocked() {
                     + " animating=" + mAnimating
                     + " tok animating="
                     + (mWin.mAppToken != null ? mWin.mAppToken.mAppAnimator.animating : false));
-            if (!showSurfaceRobustlyLocked()) {
-                return false;
-            }
 
             mService.enableScreenIfNeededLocked();
 
             applyEnterAnimationLocked();
 
+            // Force the show in the next prepareSurfaceLocked() call.
             mLastAlpha = -1;
-            mLastHidden = false;
             mDrawState = HAS_DRAWN;
+            mService.scheduleAnimationLocked();
 
             int i = mWin.mChildWindows.size();
             while (i > 0) {