Fix last change -- don't call startInputInner() with lock held.

Dianne Hackborn · Dianne Hackborn · commit 06a591cdd6d9 · 2012-02-16T10:37:06.000-08:00
Change-Id: Ie7a145c5a07f08ae8a3f5954a1c389bfbd946b69
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -336,6 +336,7 @@ public void handleMessage(Message msg) {
                 }
                 case MSG_UNBIND: {
                     final int sequence = msg.arg1;
+                    boolean startInput = false;
                     synchronized (mH) {
                         if (mBindSequence == sequence) {
                             if (false) {
@@ -356,10 +357,13 @@ public void handleMessage(Message msg) {
                                 mServedConnecting = true;
                             }
                             if (mActive) {
-                                startInputInner();
+                                startInput = true;
                             }
                         }
                     }
+                    if (startInput) {
+                        startInputInner();
+                    }
                     return;
                 }
                 case MSG_SET_ACTIVE: {
@@ -1209,12 +1213,13 @@ public void onWindowFocus(View rootView, View focusedView, int softInputMode,
                 mService.windowGainedFocus(mClient, rootView.getWindowToken(),
                         focusedView != null, isTextEditor, softInputMode, first,
                         windowFlags);
-                if (startInput) {
-                    startInputInner();
-                }
             } catch (RemoteException e) {
             }
         }
+
+        if (startInput) {
+            startInputInner();
+        }
     }
     
     /** @hide */

Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,7 @@ public void handleMessage(Message msg) {`
`336`	`336`	`}`
`337`	`337`	`case MSG_UNBIND: {`
`338`	`338`	`final int sequence = msg.arg1;`
	`339`	`+ boolean startInput = false;`
`339`	`340`	`synchronized (mH) {`
`340`	`341`	`if (mBindSequence == sequence) {`
`341`	`342`	`if (false) {`
`@@ -356,10 +357,13 @@ public void handleMessage(Message msg) {`
`356`	`357`	`mServedConnecting = true;`
`357`	`358`	`}`
`358`	`359`	`if (mActive) {`
`359`		`- startInputInner();`
	`360`	`+ startInput = true;`
`360`	`361`	`}`
`361`	`362`	`}`
`362`	`363`	`}`
	`364`	`+ if (startInput) {`
	`365`	`+ startInputInner();`
	`366`	`+ }`
`363`	`367`	`return;`
`364`	`368`	`}`
`365`	`369`	`case MSG_SET_ACTIVE: {`
`@@ -1209,12 +1213,13 @@ public void onWindowFocus(View rootView, View focusedView, int softInputMode,`
`1209`	`1213`	`mService.windowGainedFocus(mClient, rootView.getWindowToken(),`
`1210`	`1214`	`focusedView != null, isTextEditor, softInputMode, first,`
`1211`	`1215`	`windowFlags);`
`1212`		`- if (startInput) {`
`1213`		`- startInputInner();`
`1214`		`- }`
`1215`	`1216`	`} catch (RemoteException e) {`
`1216`	`1217`	`}`
`1217`	`1218`	`}`
	`1219`	`+`
	`1220`	`+ if (startInput) {`
	`1221`	`+ startInputInner();`
	`1222`	`+ }`
`1218`	`1223`	`}`
`1219`	`1224`
`1220`	`1225`	`/** @hide */`