Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7058e49 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Remove an unused param from IMMS#showInputMethodPickerFromClient()"

parents 597fe60d 3efbbb5e

core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java

+2 −3
Original line number Diff line number Diff line
@@ -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();

        }

core/java/android/view/inputmethod/InputMethodManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3462,7 +3462,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")

core/java/com/android/internal/view/IInputMethodManager.aidl

+1 −2
Original line number Diff line number Diff line
@@ -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 = "

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -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.

        mHandler.obtainMessage(MSG_SHOW_IM_SUBTYPE_PICKER, auxiliarySubtypeMode, displayId)