commit 2850a42a9f330e0d5bed27f89464cb095d7057c0
author Wale Ogunwale <ogunwale@google.com> Tue Feb 23 15:39:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 23 15:39:45 2016 +0000
tree 46eb14223f6cee06827fa23425b707daa58d00fb
parent c3eb211b702035d3dba79708c0550ac821eb9f39
parent f0cf8990330dd592b114374ad15b75bc01f69e47

Merge "Make accessing mWaitingForDrawn thread-safe"
am: f0cf899033

* commit 'f0cf8990330dd592b114374ad15b75bc01f69e47':
  Make accessing mWaitingForDrawn thread-safe

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 0c5ec27..5bf0509 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -11967,6 +11967,7 @@
 
         @Override
         public void waitForAllWindowsDrawn(Runnable callback, long timeout) {
+            boolean allWindowsDrawn = false;
             synchronized (mWindowMap) {
                 mWaitingForDrawnCallback = callback;
                 final WindowList windows = getDefaultWindowListLocked();
@@ -11987,13 +11988,16 @@
                     }
                 }
                 requestTraversalLocked();
+                mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT);
+                if (mWaitingForDrawn.isEmpty()) {
+                    allWindowsDrawn = true;
+                } else {
+                    mH.sendEmptyMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, timeout);
+                    checkDrawnWindowsLocked();
+                }
             }
-            mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT);
-            if (mWaitingForDrawn.isEmpty()) {
+            if (allWindowsDrawn) {
                 callback.run();
-            } else {
-                mH.sendEmptyMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, timeout);
-                checkDrawnWindowsLocked();
             }
         }