diff options
| author | Charles Chen <charlesccchen@google.com> | 2022-01-12 08:26:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-12 08:26:19 +0000 |
| commit | f46221dee12b23aabe4f5f5ecbeff4729ff051e8 (patch) | |
| tree | cc3b22a8f4a9f766d3b1df605029017bd8fd2d63 /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | ab91a34e7c091d6abf539dd2cb9e4124d32f89db (diff) | |
| parent | 468f72f0164f18e3da3a8b2d5fc7fbc8c55def65 (diff) | |
[RESTRICT AUTOMERGE] Attempt to fix exception in IMS am: 468f72f016
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16601123
Change-Id: I7e68b82bea841ddbb48cd5d3955605de143eb33f
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index e0324c0ded26..9f798869e54a 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -524,6 +524,7 @@ public class InputMethodService extends AbstractInputMethodService { private Handler mHandler; private boolean mImeSurfaceScheduledForRemoval; private ImsConfigurationTracker mConfigTracker = new ImsConfigurationTracker(); + private boolean mDestroyed; /** * An opaque {@link Binder} token of window requesting {@link InputMethodImpl#showSoftInput} @@ -604,6 +605,11 @@ public class InputMethodService extends AbstractInputMethodService { Log.w(TAG, "The token has already registered, ignore this initialization."); return; } + if (mDestroyed) { + Log.i(TAG, "The InputMethodService has already onDestroyed()." + + "Ignore the initialization."); + return; + } Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMS.initializeInternal"); mConfigTracker.onInitialize(configChanges); mPrivOps.set(privilegedOperations); @@ -1403,6 +1409,7 @@ public class InputMethodService extends AbstractInputMethodService { } @Override public void onDestroy() { + mDestroyed = true; super.onDestroy(); mRootView.getViewTreeObserver().removeOnComputeInternalInsetsListener( mInsetsComputer); |
