commit 5facc2f829a5683431eecc75e7bbd663c1d1cf78
author Jorim Jaggi <jjaggi@google.com> Tue Sep 23 18:46:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 23 18:46:00 2014 +0000
tree 5dc6bd8663485278f4e569b17267016ef712167e
parent 31260dfd6554a6f4d75f77737f5d8c528727b0aa
parent ff4683d2afc88470eadcd53f15667e32bc739d30

am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev

* commit 'f8704ea3351907b7f6eb066e53f00b45406d529b':
  Only wait for relevant windows when turning on the screen

services/core/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 8445b04..bc35330 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 @@
                 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.