diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 6999e3df0e2c4..aa3c3611fc7da 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -590,10 +590,6 @@ public class InputMethodService extends AbstractInputMethodService { @Override public final void initializeInternal(@NonNull IBinder token, IInputMethodPrivilegedOperations privilegedOperations, int configChanges) { - if (InputMethodPrivilegedOperationsRegistry.isRegistered(token)) { - Log.w(TAG, "The token has already registered, ignore this initialization."); - return; - } Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMS.initializeInternal"); mConfigTracker.onInitialize(configChanges); mPrivOps.set(privilegedOperations); diff --git a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperationsRegistry.java b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperationsRegistry.java index 049f952fceb8c..f8c6640afce66 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperationsRegistry.java +++ b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperationsRegistry.java @@ -74,12 +74,7 @@ public final class InputMethodPrivilegedOperationsRegistry { if (sRegistry == null) { sRegistry = new WeakHashMap<>(); } - final WeakReference previousOps = - sRegistry.put(token, new WeakReference<>(ops)); - if (previousOps != null) { - throw new IllegalStateException(previousOps.get() + " is already registered for " - + " this token=" + token + " newOps=" + ops); - } + sRegistry.put(token, new WeakReference<>(ops)); } } @@ -132,21 +127,4 @@ public final class InputMethodPrivilegedOperationsRegistry { } } } - - /** - * Check the given IME token registration status. - * - * @param token IME token - * @return {@code true} when the IME token has already registered - * {@link InputMethodPrivilegedOperations}, {@code false} otherwise. - */ - @AnyThread - public static boolean isRegistered(IBinder token) { - synchronized (sLock) { - if (sRegistry == null) { - return false; - } - return sRegistry.containsKey(token); - } - } }