diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowStateAnimator.java | 13 |
2 files changed, 5 insertions, 14 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 74572cfcdee2..1aa0711ccf88 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -3024,7 +3024,6 @@ public class WindowManagerService extends IWindowManager.Stub final long origId = Binder.clearCallingIdentity(); synchronized(mWindowMap) { - DisplayContent displayContent = null; WindowToken wtoken = mTokenMap.remove(token); if (wtoken != null) { boolean delayed = false; @@ -3034,7 +3033,6 @@ public class WindowManagerService extends IWindowManager.Stub for (int i=0; i<N; i++) { WindowState win = wtoken.windows.get(i); - displayContent = win.getDisplayContent(); if (win.mWinAnimator.isAnimating()) { delayed = true; @@ -3049,9 +3047,7 @@ public class WindowManagerService extends IWindowManager.Stub WindowManagerPolicy.TRANSIT_EXIT); } changed = true; - if (displayContent != null) { - displayContent.layoutNeeded = true; - } + win.setDisplayLayoutNeeded(); } } diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 60bf57154bc6..02522c13bd5c 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -1823,15 +1823,10 @@ class WindowStateAnimator { c.mAttachedHidden = false; if (c.mWinAnimator.mSurfaceControl != null) { c.mWinAnimator.performShowLocked(); - // It hadn't been shown, which means layout not - // performed on it, so now we want to make sure to - // do a layout. If called from within the transaction - // loop, this will cause it to restart with a new - // layout. - final DisplayContent displayContent = c.getDisplayContent(); - if (displayContent != null) { - displayContent.layoutNeeded = true; - } + // It hadn't been shown, which means layout not performed on it, so now we + // want to make sure to do a layout. If called from within the transaction + // loop, this will cause it to restart with a new layout. + c.setDisplayLayoutNeeded(); } } } |