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

Commit dbd8c1b9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove IInputMethodManager#switchToNextInputMethod()"

parents 441ca70d 70f17e7c

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

+0 −10
Original line number Diff line number Diff line
@@ -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);

    }

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

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

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

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

        }

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

+0 −7
Original line number Diff line number Diff line
@@ -1600,13 +1600,6 @@ public final class MultiClientInputMethodManagerService { 
            return false;

        }



        @BinderThread

        @Override

        public boolean switchToNextInputMethod(IBinder token, boolean onlyCurrentIme) {

            reportNotSupported();

            return false;

        }



        @BinderThread

        @Override

        public void setAdditionalInputMethodSubtypes(String imiId, InputMethodSubtype[] subtypes) {