diff options
| author | Yohei Yukawa <yukawa@google.com> | 2017-02-09 16:55:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-09 16:55:04 +0000 |
| commit | efdb4289597ad1594eb906aeafd2ebdf8854bdc7 (patch) | |
| tree | 594046a80ee0a02fd90463a4f0f84a6f02bb90d7 /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | df185d750273ecb7b2c61e98206ee9c11d76217b (diff) | |
| parent | 2bc66171cce4d5ae7bee2c3920e82e45a9d245af (diff) | |
Merge "Eliminate out-of-sync IMM#mFullscreenMode error"
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 5996fe2b14a3..5ae1fd057122 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -387,8 +387,9 @@ public class InputMethodService extends AbstractInputMethodService { mInputConnection = binding.getConnection(); if (DEBUG) Log.v(TAG, "bindInput(): binding=" + binding + " ic=" + mInputConnection); - InputConnection ic = getCurrentInputConnection(); - if (ic != null) ic.reportFullscreenMode(mIsFullscreen); + if (mImm != null && mToken != null) { + mImm.reportFullscreenMode(mToken, mIsFullscreen); + } initialize(); onBindInput(); } @@ -1027,8 +1028,9 @@ public class InputMethodService extends AbstractInputMethodService { if (mIsFullscreen != isFullscreen || !mFullscreenApplied) { changed = true; mIsFullscreen = isFullscreen; - InputConnection ic = getCurrentInputConnection(); - if (ic != null) ic.reportFullscreenMode(isFullscreen); + if (mImm != null && mToken != null) { + mImm.reportFullscreenMode(mToken, mIsFullscreen); + } mFullscreenApplied = true; initialize(); LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) |