Merge "Unbind InputMethod when app crashes"

2018-02-21 20:59:09 +00:00
parent e70172cbd3 93c00ceafb
commit fa0ddd1071
1 changed files with 7 additions and 0 deletions
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -1706,6 +1706,13 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
            if (cs != null) {
                clearClientSessionLocked(cs);
                if (mCurClient == cs) {
+                    if (mBoundToMethod) {
+                        mBoundToMethod = false;
+                        if (mCurMethod != null) {
+                            executeOrSendMessage(mCurMethod, mCaller.obtainMessageO(
+                                    MSG_UNBIND_INPUT, mCurMethod));
+                        }
+                    }
                    mCurClient = null;
                }
                if (mCurFocusedWindowClient == cs) {