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

Commit 1ab5fdb4 authored by Wilson Wu's avatar Wilson Wu Committed by Automerger Merge Worker
Browse files

Merge "Make IInputMethodPrivilegedOperations to async (6/N)" into sc-dev am: f5cded5a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14326777

Change-Id: Ic70a3f60a44e0f2611a2b1a90af5b18d7695b3f5
parents 72a9ae2d f5cded5a

core/java/android/inputmethodservice/InputMethodService.java

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

            cancelImeSurfaceRemoval();

        }

        mPrivOps.applyImeVisibility(setVisible

        mPrivOps.applyImeVisibilityAsync(setVisible

                ? mCurShowInputToken : mCurHideInputToken, setVisible);

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -44,6 +44,5 @@ oneway interface IInputMethodPrivilegedOperations { 
    void switchToNextInputMethod(boolean onlyCurrentIme, in IBooleanResultCallback resultCallback);

    void shouldOfferSwitchingToNextInputMethod(in IBooleanResultCallback resultCallback);

    void notifyUserActionAsync();

    void applyImeVisibility(IBinder showOrHideInputToken, boolean setVisible,

            in IVoidResultCallback resultCallback);

    void applyImeVisibilityAsync(IBinder showOrHideInputToken, boolean setVisible);

}

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

+3 −6
Original line number Diff line number Diff line
@@ -375,8 +375,7 @@ public final class InputMethodPrivilegedOperations { 
    }



    /**

     * Calls {@link IInputMethodPrivilegedOperations#applyImeVisibility(IBinder, boolean,

     * IVoidResultCallback)}.

     * Calls {@link IInputMethodPrivilegedOperations#applyImeVisibilityAsync(IBinder, boolean)}.

     *

     * @param showOrHideInputToken placeholder token that maps to window requesting

     *        {@link android.view.inputmethod.InputMethodManager#showSoftInput(View, int)} or
@@ -385,15 +384,13 @@ public final class InputMethodPrivilegedOperations { 
     * @param setVisible {@code true} to set IME visible, else hidden.

     */

    @AnyThread

    public void applyImeVisibility(IBinder showOrHideInputToken, boolean setVisible) {

    public void applyImeVisibilityAsync(IBinder showOrHideInputToken, boolean setVisible) {

        final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull();

        if (ops == null) {

            return;

        }

        try {

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

            ops.applyImeVisibility(showOrHideInputToken, setVisible, ResultCallbacks.of(value));

            Completable.getResult(value);

            ops.applyImeVisibilityAsync(showOrHideInputToken, setVisible);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

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

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


        @BinderThread

        @Override

        public void applyImeVisibility(IBinder windowToken, boolean setVisible,

                IVoidResultCallback resultCallback) {

            CallbackUtils.onResult(resultCallback,

                    () -> mImms.applyImeVisibility(mToken, windowToken, setVisible));

        public void applyImeVisibilityAsync(IBinder windowToken, boolean setVisible) {

            mImms.applyImeVisibility(mToken, windowToken, setVisible);

        }

    }

}