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

Commit 738468ba authored by Wilson Wu's avatar Wilson Wu
Browse files

Make IInputMethodPrivilegedOperations to async (2/N) 

-. Remove VoidResultCallback of reportStartInput
   and let it be truly asynchronous.
-. Rename this method to reportStartInputAsync.

Bug: 183587528
Test: atest CtsInputMethodTestCases
Change-Id: Ic8e7f888f78f7c536a9228db02a8b355555d7220
parent 60f71b5b

core/java/android/inputmethodservice/InputMethodService.java

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ public class InputMethodService extends AbstractInputMethodService { 
        public final void dispatchStartInputWithToken(@Nullable InputConnection inputConnection,

                @NonNull EditorInfo editorInfo, boolean restarting,

                @NonNull IBinder startInputToken) {

            mPrivOps.reportStartInput(startInputToken);

            mPrivOps.reportStartInputAsync(startInputToken);



            if (restarting) {

                restartInput(inputConnection, editorInfo);

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.android.internal.inputmethod.IVoidResultCallback; 
 */

oneway interface IInputMethodPrivilegedOperations {

    void setImeWindowStatusAsync(int vis, int backDisposition);

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

    void reportStartInputAsync(in IBinder startInputToken);

    void createInputContentUriToken(in Uri contentUri, in String packageName,

            in IIInputContentUriTokenResultCallback resultCallback);

    void reportFullscreenMode(boolean fullscreen, in IVoidResultCallback resultCallback);

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

+3 −6
Original line number Diff line number Diff line
@@ -123,21 +123,18 @@ public final class InputMethodPrivilegedOperations { 
    }



    /**

     * Calls {@link IInputMethodPrivilegedOperations#reportStartInput(IBinder,

     * IVoidResultCallback)}.

     * Calls {@link IInputMethodPrivilegedOperations#reportStartInputAsync(IBinder)}.

     *

     * @param startInputToken {@link IBinder} token to distinguish startInput session

     */

    @AnyThread

    public void reportStartInput(IBinder startInputToken) {

    public void reportStartInputAsync(IBinder startInputToken) {

        final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull();

        if (ops == null) {

            return;

        }

        try {

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

            ops.reportStartInput(startInputToken, ResultCallbacks.of(value));

            Completable.getResult(value);

            ops.reportStartInputAsync(startInputToken);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

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

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


        @BinderThread

        @Override

        public void reportStartInput(IBinder startInputToken, IVoidResultCallback resultCallback) {

            CallbackUtils.onResult(resultCallback,

                    () -> mImms.reportStartInput(mToken, startInputToken));

        public void reportStartInputAsync(IBinder startInputToken) {

            mImms.reportStartInput(mToken, startInputToken);

        }



        @BinderThread