Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec403e8f: Merge "Call startInput on return from sleep mode"

Browse Source 
* commit 'ec403e8f476c817b87c0ef9297fdb548e8b1e4e4':
  Call startInput on return from sleep mode
This commit is contained in:
Jeff Brown
2015-02-13 02:06:01 +00:00
committed by Android Git Automerger
parent 8be3724a06 ec403e8f47
commit 6c477a29bf
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -494,19 +494,17 @@ public final class InputMethodManager {
mIInputContext.finishComposingText(); mIInputContext.finishComposingText();
} catch (RemoteException e) { } catch (RemoteException e) {
} }
// Check focus again in case that "onWindowFocus" is called before }
// handling this message. // Check focus again in case that "onWindowFocus" is called before
if (mServedView != null && mServedView.hasWindowFocus()) { // handling this message.
// "finishComposingText" has been already called above. So we if (mServedView != null && mServedView.hasWindowFocus()) {
// should not call mServedInputConnection.finishComposingText here. // Please note that this handler thread could be different
// Also, please note that this handler thread could be different // from a thread that created mServedView. That could happen
// from a thread that created mServedView. That could happen // the current activity is running in the system process.
// the current activity is running in the system process. // In that case, we really should not call
// In that case, we really should not call // mServedInputConnection.finishComposingText.
// mServedInputConnection.finishComposingText. if (checkFocusNoStartInput(mHasBeenInactive, false)) {
if (checkFocusNoStartInput(mHasBeenInactive, false)) { startInputInner(null, 0, 0, 0);
startInputInner(null, 0, 0, 0);
}
} }
} }
} }