diff options
4 files changed, 2 insertions, 21 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 13409554da28..2794e0890b15 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -2548,16 +2548,6 @@ public final class InputMethodManager { */ @Deprecated public boolean switchToNextInputMethod(IBinder imeToken, boolean onlyCurrentIme) { - if (imeToken == null) { - // Note: null token is allowed for callers that have WRITE_SECURE_SETTINGS permission. - // Thus we cannot always rely on InputMethodPrivilegedOperationsRegistry unfortunately. - // TODO(Bug 114488811): Consider deprecating null token rule. - try { - return mService.switchToNextInputMethod(imeToken, onlyCurrentIme); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } return InputMethodPrivilegedOperationsRegistry.get(imeToken) .switchToNextInputMethod(onlyCurrentIme); } diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index 1e71bd171eea..42d73e3ad2cb 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -76,8 +76,6 @@ interface IInputMethodManager { boolean setCurrentInputMethodSubtype(in InputMethodSubtype subtype); // TODO(Bug 114488811): this can be removed once we deprecate special null token rule. boolean switchToPreviousInputMethod(in IBinder token); - // TODO(Bug 114488811): this can be removed once we deprecate special null token rule. - boolean switchToNextInputMethod(in IBinder token, boolean onlyCurrentIme); void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes); // This is kept due to @UnsupportedAppUsage. // TODO(Bug 113914148): Consider removing this. diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index a8da9680c4f5..a2559552c836 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -3191,8 +3191,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - @Override - public boolean switchToNextInputMethod(IBinder token, boolean onlyCurrentIme) { + @BinderThread + private boolean switchToNextInputMethod(IBinder token, boolean onlyCurrentIme) { if (!calledFromValidUser()) { return false; } diff --git a/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java index 2b67fe72c2e7..dcd2912fda68 100644 --- a/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java @@ -1602,13 +1602,6 @@ public final class MultiClientInputMethodManagerService { @BinderThread @Override - public boolean switchToNextInputMethod(IBinder token, boolean onlyCurrentIme) { - reportNotSupported(); - return false; - } - - @BinderThread - @Override public void setAdditionalInputMethodSubtypes(String imiId, InputMethodSubtype[] subtypes) { reportNotSupported(); } |