diff options
4 files changed, 5 insertions, 8 deletions
diff --git a/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java b/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java index e8b1b46b83b6..a66c67b2e255 100644 --- a/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java +++ b/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java @@ -346,14 +346,13 @@ final class IInputMethodManagerGlobalInvoker { @AnyThread @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) - static void showInputMethodPickerFromSystem(@NonNull IInputMethodClient client, - int auxiliarySubtypeMode, int displayId) { + static void showInputMethodPickerFromSystem(int auxiliarySubtypeMode, int displayId) { final IInputMethodManager service = getService(); if (service == null) { return; } try { - service.showInputMethodPickerFromSystem(client, auxiliarySubtypeMode, displayId); + service.showInputMethodPickerFromSystem(auxiliarySubtypeMode, displayId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 91df4f5def5c..d08816b7dafc 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -3463,7 +3463,7 @@ public final class InputMethodManager { final int mode = showAuxiliarySubtypes ? SHOW_IM_PICKER_MODE_INCLUDE_AUXILIARY_SUBTYPES : SHOW_IM_PICKER_MODE_EXCLUDE_AUXILIARY_SUBTYPES; - IInputMethodManagerGlobalInvoker.showInputMethodPickerFromSystem(mClient, mode, displayId); + IInputMethodManagerGlobalInvoker.showInputMethodPickerFromSystem(mode, displayId); } @GuardedBy("mH") diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index f7bb16e8ba54..40c6a05650cf 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -81,8 +81,7 @@ interface IInputMethodManager { @EnforcePermission("WRITE_SECURE_SETTINGS") @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = " + "android.Manifest.permission.WRITE_SECURE_SETTINGS)") - void showInputMethodPickerFromSystem(in IInputMethodClient client, - int auxiliarySubtypeMode, int displayId); + void showInputMethodPickerFromSystem(int auxiliarySubtypeMode, int displayId); @EnforcePermission("TEST_INPUT_METHOD") @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = " diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 565b2aca4efc..fcdb1f58f458 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -3925,8 +3925,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub @EnforcePermission(Manifest.permission.WRITE_SECURE_SETTINGS) @Override - public void showInputMethodPickerFromSystem(IInputMethodClient client, int auxiliarySubtypeMode, - int displayId) { + public void showInputMethodPickerFromSystem(int auxiliarySubtypeMode, int displayId) { // Always call subtype picker, because subtype picker is a superset of input method // picker. super.showInputMethodPickerFromSystem_enforcePermission(); |