Merge "Really fix regressions in IMMS#setImeWindowStatus"

2017-02-20 17:43:45 +00:00
parent 88c0facc1e bbb10e8ec0
commit 135e5aac1b
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -2046,7 +2046,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
        }
        mWindowManagerInternal.updateInputMethodWindowStatus(token,
                (vis & InputMethodService.IME_VISIBLE) != 0,
-                token != null ? info.mTargetWindow : null);
+                info != null ? info.mTargetWindow : null);
    }

    private void updateSystemUi(IBinder token, int vis, int backDisposition) {