commit 3ad6de6ec73448011513675f654f8bd7362c21e8
author android-build-team Robot <android-build-team-robot@google.com> Wed May 02 12:02:46 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 02 12:02:46 2018 +0000
tree e6ab8339f44f376b06c822a4a38beaaabaeaa296
parent 724990d5ff2beaca1140c47a737c513a743d3c54
parent 849d2935e356e89a414c8bad1e07a2051f6e419d

Merge "WindowStateAnimator: Hide preserved surface when showing new Surface" into pi-dev

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

diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index a3428f0..4a6587b 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1287,6 +1287,12 @@
         if (!shown)
             return false;
 
+        // If we had a preserved surface it's no longer needed, and it may be harmful
+        // if we are transparent.
+        if (mPendingDestroySurface != null && mDestroyPreservedSurfaceUponRedraw) {
+            mPendingDestroySurface.mSurfaceControl.hide();
+        }
+
         return true;
     }