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

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

Merge "Remove unused IInputMethod#revokeSession"

parents 05478fd4 99cc65c4

core/java/android/inputmethodservice/IInputMethodWrapper.java

+0 −20
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ class IInputMethodWrapper extends IInputMethod.Stub 
    private static final int DO_START_INPUT = 32;

    private static final int DO_CREATE_SESSION = 40;

    private static final int DO_SET_SESSION_ENABLED = 45;

    private static final int DO_REVOKE_SESSION = 50;

    private static final int DO_SHOW_SOFT_INPUT = 60;

    private static final int DO_HIDE_SOFT_INPUT = 70;

    private static final int DO_CHANGE_INPUTMETHOD_SUBTYPE = 80;
@@ -215,9 +214,6 @@ class IInputMethodWrapper extends IInputMethod.Stub 
                inputMethod.setSessionEnabled((InputMethodSession)msg.obj,

                        msg.arg1 != 0);

                return;

            case DO_REVOKE_SESSION:

                inputMethod.revokeSession((InputMethodSession)msg.obj);

                return;

            case DO_SHOW_SOFT_INPUT: {

                final SomeArgs args = (SomeArgs)msg.obj;

                inputMethod.showSoftInputWithToken(
@@ -366,22 +362,6 @@ class IInputMethodWrapper extends IInputMethod.Stub 
        }

    }



    @BinderThread

    @Override

    public void revokeSession(IInputMethodSession session) {

        try {

            InputMethodSession ls = ((IInputMethodSessionWrapper)

                    session).getInternalInputMethodSession();

            if (ls == null) {

                Log.w(TAG, "Session is already finished: " + session);

                return;

            }

            mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_REVOKE_SESSION, ls));

        } catch (ClassCastException e) {

            Log.w(TAG, "Incoming session not of correct type: " + session, e);

        }

    }



    @BinderThread

    @Override

    public void showSoftInput(IBinder showInputToken, int flags, ResultReceiver resultReceiver) {

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

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ oneway interface IInputMethod { 


    void setSessionEnabled(IInputMethodSession session, boolean enabled);



    void revokeSession(IInputMethodSession session);



    void showSoftInput(in IBinder showInputToken, int flags, in ResultReceiver resultReceiver);



    void hideSoftInput(in IBinder hideInputToken, int flags, in ResultReceiver resultReceiver);