summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-12-02 16:47:29 -0800
committer Craig Mautner <cmautner@google.com> 2014-12-02 16:47:29 -0800
commit6ee618509a392adb183c2e70390cd9e2031ff0d8 (patch)
tree8f4a001e28d02a96f958f2873bc82ae321746722
parent92ad4dd017a13364b4001bdb04911202932f81c2 (diff)
Don't process windows belonging to unshown users
Add a test for whether a window will be shown to the current user. Otherwise we wait to process windows that are drawn but will never be shown. Consequently we end up in a layout loop that continues to set pendingLayoutChanges at the point where "wallpaper and commitFinishDrawingLocked true" message is generated. Fixes bug 18510914. Change-Id: Ib067b41b5f26b146ee6bdb16c2f3b07d20aa2c54
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 6a55ffce79e3..b7857e12a0fe 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -9764,7 +9764,7 @@ public class WindowManagerService extends IWindowManager.Stub
w.mContentChanged = false;
// Moved from updateWindowsAndWallpaperLocked().
- if (w.mHasSurface) {
+ if (w.mHasSurface && !w.isHiddenFromUserLocked()) {
// Take care of the window being ready to display.
final boolean committed =
winAnimator.commitFinishDrawingLocked(currentTime);