am 7f7ac5b4: am fda1bff8: Merge "Correct the target app token for input method window"

* commit '7f7ac5b4a86be479bdede226fd4a2bddcd8a9a2b': Correct the target app token for input method window
2013-03-18 17:50:32 -07:00
parent 4ad2f93cff 7f7ac5b4a8
commit aea8b0e571
1 changed files with 5 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -1481,7 +1481,11 @@ public class WindowManagerService extends IWindowManager.Stub
                    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;
                }
            }