diff options
author | Yohei Yukawa <yukawa@google.com> | 2015-05-21 21:47:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 21:47:36 +0000 |
commit | c0a9cd440db7a2881baf5f970eb78aabc11614e3 (patch) | |
tree | b69b7b218e5438fd4d9e99d7a868e8201a1a7e3a | |
parent | 7d85ea93e951dc1dd82e7879e0399c56d116f231 (diff) | |
parent | 0f3a99d837048ae82855c2306cd454426393c19f (diff) | |
download | frameworks_base-c0a9cd440db7a2881baf5f970eb78aabc11614e3.zip frameworks_base-c0a9cd440db7a2881baf5f970eb78aabc11614e3.tar.gz frameworks_base-c0a9cd440db7a2881baf5f970eb78aabc11614e3.tar.bz2 |
Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev
-rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 824b434..f61e372 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -801,25 +801,21 @@ public final class InputMethodManager { mServedInputConnectionWrapper = null; } } - + /** * Disconnect any existing input connection, clearing the served view. */ void finishInputLocked() { - mCurRootView = null; mNextServedView = null; if (mServedView != null) { if (DEBUG) Log.v(TAG, "FINISH INPUT: " + mServedView); - if (mCurrentTextBoxAttribute != null) { try { mService.finishInput(mClient); } catch (RemoteException e) { } } - notifyInputConnectionFinished(); - mServedView = null; mCompletions = null; mServedConnecting = false; |