diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowStateAnimator.java | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 9d3a49d8c675..aaf59b9f8e40 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -4106,11 +4106,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mDestroying = true; final boolean hasSurface = mWinAnimator.hasSurface(); - if (hasSurface) { - // Use pendingTransaction here so hide is done the same transaction as the other - // animations when exiting - mWinAnimator.hide(getPendingTransaction(), "onExitAnimationDone"); - } + + // Use pendingTransaction here so hide is done the same transaction as the other + // animations when exiting + mWinAnimator.hide(getPendingTransaction(), "onExitAnimationDone"); // If we have an app token, we ask it to destroy the surface for us, so that it can take // care to ensure the activity has actually stopped and the surface is not still in use. diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index ab5e24ac5999..195274ae27aa 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -308,6 +308,12 @@ class WindowStateAnimator { if (!mLastHidden) { //dump(); mLastHidden = true; + + // We may have a preserved surface which we no longer need. If there was a quick + // VISIBLE, GONE, VISIBLE, GONE sequence, the surface may never draw, so we don't mark + // it to be destroyed in prepareSurfaceLocked. + markPreservedSurfaceForDestroy(); + if (mSurfaceController != null) { mSurfaceController.hide(transaction, reason); } |