Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev am: ff8ceadfc8 am: c5bdda2236

am: 0cfcd14e7b

* commit '0cfcd14e7b97a064e416957f115dea4e1d4650eb':
  Request a traversal when a saved surface gets redrawn

Change-Id: Ie0db6c2fd7d6eb198efa22fe00d5f819ddb8d402

services/core/java/com/android/server/wm/WindowState.java

@@ -2115,14 +2115,16 @@ final class WindowState implements WindowManagerPolicy.WindowState {
         mWasVisibleBeforeClientHidden = false;
     }
 
-    void clearAnimatingWithSavedSurface() {
+    boolean clearAnimatingWithSavedSurface() {
         if (mAnimatingWithSavedSurface) {
             // App has drawn something to its windows, we're no longer animating with
             // the saved surfaces.
             if (DEBUG_ANIM) Slog.d(TAG,
                     "clearAnimatingWithSavedSurface(): win=" + this);
             mAnimatingWithSavedSurface = false;
+            return true;
         }
+        return false;
     }
 
     @Override

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

@@ -585,7 +585,7 @@ class WindowStateAnimator {
                     + drawStateToString());
         }
 
-        mWin.clearAnimatingWithSavedSurface();
+        boolean layoutNeeded = mWin.clearAnimatingWithSavedSurface();
 
         if (mDrawState == DRAW_PENDING) {
             if (DEBUG_SURFACE_TRACE || DEBUG_ANIM || SHOW_TRANSACTIONS || DEBUG_ORIENTATION)
@@ -595,10 +595,10 @@ class WindowStateAnimator {
                 Slog.v(TAG, "Draw state now committed in " + mWin);
             }
             mDrawState = COMMIT_DRAW_PENDING;
-            return true;
+            layoutNeeded = true;
         }
 
-        return false;
+        return layoutNeeded;
     }
 
     // This must be called while inside a transaction.