commit fda1bff8a8eda96662577820102aaaa02a0845b6
author Craig Mautner <cmautner@google.com> Mon Mar 18 15:56:48 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 18 15:56:48 2013 +0000
tree 7f5d809f080536ab483eac9845fded60fef9b328
parent 519ba7b10c4e0da3586aeeaa9696349f28313898
parent 5c97184c3a92dd2a608fd031ab5c01574030777a

Merge "Correct the target app token for input method window"

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

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 0466c15..194c750 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -1514,7 +1514,11 @@
                     pos++;
                 }
                 if (pos >= N) {
-                    // All is good!
+                    // Z order is good.
+                    // The IM target window may be changed, so update the mTargetAppToken.
+                    if (imWin != null) {
+                        imWin.mTargetAppToken = mInputMethodTarget.mAppToken;
+                    }
                     return false;
                 }
             }