drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.

Browse Source 
* commit '01810bbb67b7af741b0dde0d7ccdadb76a46ed63':
  Fix last change -- don't call startInputInner() with lock held.
This commit is contained in:
Dianne Hackborn
2012-02-16 14:45:57 -08:00
committed by Android Git Automerger
parent 9f78285290 01810bbb67
commit 804aa29795
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/view/inputmethod/InputMethodManager.java
View File

@ -336,6 +336,7 @@ public final class InputMethodManager {
} }
case MSG_UNBIND: { case MSG_UNBIND: {
final int sequence = msg.arg1; final int sequence = msg.arg1;
boolean startInput = false;
synchronized (mH) { synchronized (mH) {
if (mBindSequence == sequence) { if (mBindSequence == sequence) {
if (false) { if (false) {
@ -356,10 +357,13 @@ public final class InputMethodManager {
mServedConnecting = true; mServedConnecting = true;
} }
if (mActive) { if (mActive) {
startInput = true;
}
}
}
if (startInput) {
startInputInner(); startInputInner();
} }
}
}
return; return;
} }
case MSG_SET_ACTIVE: { case MSG_SET_ACTIVE: {
@ -1209,12 +1213,13 @@ public final class InputMethodManager {
mService.windowGainedFocus(mClient, rootView.getWindowToken(), mService.windowGainedFocus(mClient, rootView.getWindowToken(),
focusedView != null, isTextEditor, softInputMode, first, focusedView != null, isTextEditor, softInputMode, first,
windowFlags); windowFlags);
if (startInput) {
startInputInner();
}
} catch (RemoteException e) { } catch (RemoteException e) {
} }
} }
if (startInput) {
startInputInner();
}
} }
/** @hide */ /** @hide */