Merge "Revert "Refactoring: two more calls for WindowState.setDisplayLayoutNeeded.""
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 1aa0711..74572cf 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3024,6 +3024,7 @@
final long origId = Binder.clearCallingIdentity();
synchronized(mWindowMap) {
+ DisplayContent displayContent = null;
WindowToken wtoken = mTokenMap.remove(token);
if (wtoken != null) {
boolean delayed = false;
@@ -3033,6 +3034,7 @@
for (int i=0; i<N; i++) {
WindowState win = wtoken.windows.get(i);
+ displayContent = win.getDisplayContent();
if (win.mWinAnimator.isAnimating()) {
delayed = true;
@@ -3047,7 +3049,9 @@
WindowManagerPolicy.TRANSIT_EXIT);
}
changed = true;
- win.setDisplayLayoutNeeded();
+ if (displayContent != null) {
+ displayContent.layoutNeeded = true;
+ }
}
}
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 02522c1..60bf571 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1823,10 +1823,15 @@
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.
- c.setDisplayLayoutNeeded();
+ // 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;
+ }
}
}
}