summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2014-09-23 18:26:05 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-09-23 18:26:09 +0000
commit2fb173a34be19ac6886b923865fc6fd247e3990e (patch)
tree5635cbbf80a0c8e6a44a4ad584fb98c9de3870f3
parenta93e58f888c8012312cf83f051236ecea46a6b95 (diff)
parentdc9ead4409d784620c6c65a56ca083ff7dd817f0 (diff)
Merge "Only wait for relevant windows when turning on the screen" into lmp-dev
-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 8445b042695e..bc353300f019 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -11576,7 +11576,7 @@ public class WindowManagerService extends IWindowManager.Stub
final WindowList windows = getDefaultWindowListLocked();
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowState win = windows.get(winNdx);
- if (win.mHasSurface
+ if (win.isVisibleLw()
&& (win.mAppToken != null || mPolicy.isForceHiding(win.mAttrs))) {
win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;
// Force add to mResizingWindows.