commit 27b826325c6201a0bb96efb1011c752408ece18a
author Craig Mautner <cmautner@google.com> Thu Oct 03 21:28:38 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 03 21:28:38 2013 +0000
tree 47276a3d5b02bcdf99edfd83a580679c600a4e75
parent 3eb6e4b4e46d64f96cba2d92265f7d3da0b8106a
parent ae87962e3ed41a8f502640a388f40ff33d7c3616

Merge "Retain IME assignment if no windows accept input." into klp-dev

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 2e91e03..9bbaf60 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -1232,10 +1232,10 @@
         // the IME above it until it is completely gone so it doesn't drop
         // behind the dialog or its full-screen scrim.
         final WindowState curTarget = mInputMethodTarget;
-        if (curTarget != null && w != null
+        if (curTarget != null
                 && curTarget.isDisplayedLw()
                 && curTarget.isClosing()
-                && (curTarget.mWinAnimator.mAnimLayer > w.mWinAnimator.mAnimLayer)) {
+                && (w == null || curTarget.mWinAnimator.mAnimLayer > w.mWinAnimator.mAnimLayer)) {
             if (DEBUG_INPUT_METHOD) Slog.v(TAG, "Current target higher, not changing");
             return windows.indexOf(curTarget) + 1;
         }