commit d59921149bb5948ffbcb9a9e832e9ac1538e05a0
author Pirama Arumuga Nainar <pirama@google.com> Fri Oct 09 16:57:54 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 09 16:57:54 2015 +0000
tree e1a96de24797c5320f2868d17f48416787a92390
parent 21b37a5fb46f3dcd20bba0c621d8859e1c8dc32e
parent 115b4117a0c19a31231d4df5f2b73c6c88e6726c

Merge "Fix punctuation and typos in AllocationAdapter's documentation."

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 806f241..c4d541c 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6192,10 +6192,13 @@
         int retryCount = 0;
         WindowState appWin = null;
 
-        final boolean appIsImTarget = mInputMethodTarget != null
-                && mInputMethodTarget.mAppToken != null
-                && mInputMethodTarget.mAppToken.appToken != null
-                && mInputMethodTarget.mAppToken.appToken.asBinder() == appToken;
+        boolean appIsImTarget;
+        synchronized(mWindowMap) {
+            appIsImTarget = mInputMethodTarget != null
+                    && mInputMethodTarget.mAppToken != null
+                    && mInputMethodTarget.mAppToken.appToken != null
+                    && mInputMethodTarget.mAppToken.appToken.asBinder() == appToken;
+        }
 
         final int aboveAppLayer = (mPolicy.windowTypeToLayerLw(TYPE_APPLICATION) + 1)
                 * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET;