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

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

Merge "Make IInputMethodPrivilegedOperations to async (5/N)" into sc-dev

parents 7c9d3192 e702c9d3

core/java/android/inputmethodservice/InputMethodService.java

+1 −1
Original line number Diff line number Diff line
@@ -3319,7 +3319,7 @@ public class InputMethodService extends AbstractInputMethodService { 
            if (mNotifyUserActionSent) {

                return;

            }

            mPrivOps.notifyUserAction();

            mPrivOps.notifyUserActionAsync();

            mNotifyUserActionSent = true;

        }

    }

core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ oneway interface IInputMethodPrivilegedOperations { 
    void switchToPreviousInputMethod(in IBooleanResultCallback resultCallback);

    void switchToNextInputMethod(boolean onlyCurrentIme, in IBooleanResultCallback resultCallback);

    void shouldOfferSwitchingToNextInputMethod(in IBooleanResultCallback resultCallback);

    void notifyUserAction(in IVoidResultCallback resultCallback);

    void notifyUserActionAsync();

    void applyImeVisibility(IBinder showOrHideInputToken, boolean setVisible,

            in IVoidResultCallback resultCallback);

}

core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java

+3 −5
Original line number Diff line number Diff line
@@ -359,18 +359,16 @@ public final class InputMethodPrivilegedOperations { 
    }



    /**

     * Calls {@link IInputMethodPrivilegedOperations#notifyUserAction(IVoidResultCallback)}

     * Calls {@link IInputMethodPrivilegedOperations#notifyUserActionAsync()}

     */

    @AnyThread

    public void notifyUserAction() {

    public void notifyUserActionAsync() {

        final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull();

        if (ops == null) {

            return;

        }

        try {

            final Completable.Void value = Completable.createVoid();

            ops.notifyUserAction(ResultCallbacks.of(value));

            Completable.getResult(value);

            ops.notifyUserActionAsync();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -6117,8 +6117,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


        @BinderThread

        @Override

        public void notifyUserAction(IVoidResultCallback resultCallback) {

            CallbackUtils.onResult(resultCallback, () -> mImms.notifyUserAction(mToken));

        public void notifyUserActionAsync() {

            mImms.notifyUserAction(mToken);

        }



        @BinderThread