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

Commit 889e3d63 authored by Wilson Wu's avatar Wilson Wu Committed by Android (Google) Code Review
Browse files

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

parents b2ee6ea1 1b8593fd

core/java/android/inputmethodservice/InputMethodService.java

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    }



    private void setImeWindowStatus(int visibilityFlags, int backDisposition) {

        mPrivOps.setImeWindowStatus(visibilityFlags, backDisposition);

        mPrivOps.setImeWindowStatusAsync(visibilityFlags, backDisposition);

    }



    /** Set region of the keyboard to be avoided from back gesture */

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.internal.inputmethod.IVoidResultCallback; 
 * Actual operations are implemented and handled by InputMethodManagerService.

 */

oneway interface IInputMethodPrivilegedOperations {

    void setImeWindowStatus(int vis, int backDisposition, in IVoidResultCallback resultCallback);

    void setImeWindowStatusAsync(int vis, int backDisposition);

    void reportStartInput(in IBinder startInputToken, in IVoidResultCallback resultCallback);

    void createInputContentUriToken(in Uri contentUri, in String packageName,

            in IIInputContentUriTokenResultCallback resultCallback);

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

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



    /**

     * Calls {@link IInputMethodPrivilegedOperations#setImeWindowStatus(int, int,

     * IVoidResultCallback)}.

     * Calls {@link IInputMethodPrivilegedOperations#setImeWindowStatusAsync(int, int}.

     *

     * @param vis visibility flags

     * @param backDisposition disposition flags
@@ -107,15 +106,13 @@ public final class InputMethodPrivilegedOperations { 
     * @see android.inputmethodservice.InputMethodService#BACK_DISPOSITION_ADJUST_NOTHING

     */

    @AnyThread

    public void setImeWindowStatus(int vis, int backDisposition) {

    public void setImeWindowStatusAsync(int vis, int backDisposition) {

        final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull();

        if (ops == null) {

            return;

        }

        try {

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

            ops.setImeWindowStatus(vis, backDisposition, ResultCallbacks.of(value));

            Completable.getResult(value);

            ops.setImeWindowStatusAsync(vis, backDisposition);

        } 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
@@ -5975,10 +5975,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


        @BinderThread

        @Override

        public void setImeWindowStatus(int vis, int backDisposition,

                IVoidResultCallback resultCallback) {

            CallbackUtils.onResult(resultCallback,

                    () -> mImms.setImeWindowStatus(mToken, vis, backDisposition));

        public void setImeWindowStatusAsync(int vis, int backDisposition) {

            mImms.setImeWindowStatus(mToken, vis, backDisposition);

        }



        @BinderThread