From 528b4b75729443f805617f9628b352f6854978cc Mon Sep 17 00:00:00 2001
From: Justin Koh <justinkoh@google.com>
Date: Tue, 22 Jul 2014 00:26:23 +0000
Subject: [PATCH] Revert "Wait for all windows to draw before turning screen
 on"

This reverts commit 0a589b929e18d05d1345d97283c3025058ddca18.

Change-Id: Ia73555cd7797b5d172f33db9f46ebc211af6fc1e
---
 .../server/wm/WindowManagerService.java       | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index e3e79f0fbe8a0..5626c7a2aad03 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -10930,19 +10930,14 @@ public class WindowManagerService extends IWindowManager.Stub
         public void waitForAllWindowsDrawn(IRemoteCallback callback, long timeout) {
             synchronized (mWindowMap) {
                 mWaitingForDrawnCallback = callback;
-                for (int displayNdx = mDisplayContents.size() - 1; displayNdx >= 0; --displayNdx) {
-                    final WindowList windows =
-                            mDisplayContents.valueAt(displayNdx).getWindowList();
-                    for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
-                        final WindowState win = windows.get(winNdx);
-                        if (win.mHasSurface) {
-                            win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;
-                            // Force add to mResizingWindows.
-                            win.mLastContentInsets.set(-1, -1, -1, -1);
-                            if (DEBUG_SCREEN_ON) Slog.d(TAG, "waitForAllWindowsDrawn: adding " +
-                                    win);
-                            mWaitingForDrawn.add(win);
-                        }
+                final WindowList windows = getDefaultWindowListLocked();
+                for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
+                    final WindowState win = windows.get(winNdx);
+                    if (win.mHasSurface) {
+                        win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;
+                        // Force add to mResizingWindows.
+                        win.mLastContentInsets.set(-1, -1, -1, -1);
+                        mWaitingForDrawn.add(win);
                     }
                 }
                 requestTraversalLocked();