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

Commit b765a026 authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Modifies some IMMS binder calls to oneway 

The IMMS binder calls used for hiding the IME in CTS tests and showing
the IME Switcher Menu have no return value, and shoulnd't be blocking.

Flag: EXEMPT cleanup
Bug: 281029564
Test: atest CtsInputMethodTestCases
Change-Id: Ie4e91371030e75b9c00b8927f7f097231b23fde9
parent e3131a9b

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ interface IInputMethodManager { 
    @EnforcePermission("TEST_INPUT_METHOD")

    @EnforcePermission("TEST_INPUT_METHOD")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.TEST_INPUT_METHOD)")

            + "android.Manifest.permission.TEST_INPUT_METHOD)")

    void hideSoftInputFromServerForTest();

    oneway void hideSoftInputFromServerForTest();





    // TODO(b/418839448): merge with startInputOrWindowGainedFocus once

    // TODO(b/418839448): merge with startInputOrWindowGainedFocus once

    //                    WINDOW_FOCUS_GAIN_REPORT_ONLY uses async method.

    //                    WINDOW_FOCUS_GAIN_REPORT_ONLY uses async method.
@@ -117,13 +117,13 @@ interface IInputMethodManager { 
            in ImeOnBackInvokedDispatcher imeDispatcher, boolean imeRequestedVisible,

            in ImeOnBackInvokedDispatcher imeDispatcher, boolean imeRequestedVisible,

            int startInputSeq);

            int startInputSeq);





    void showInputMethodPickerFromClient(in IInputMethodClient client,

    oneway void showInputMethodPickerFromClient(in IInputMethodClient client,

            int auxiliarySubtypeMode);

            int auxiliarySubtypeMode);





    @EnforcePermission(allOf = {"WRITE_SECURE_SETTINGS", "INTERACT_ACROSS_USERS_FULL"})

    @EnforcePermission(allOf = {"WRITE_SECURE_SETTINGS", "INTERACT_ACROSS_USERS_FULL"})

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf = {android.Manifest."

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf = {android.Manifest."

    + "permission.WRITE_SECURE_SETTINGS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})")

    + "permission.WRITE_SECURE_SETTINGS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})")

    void showInputMethodPickerFromSystem(int auxiliarySubtypeMode, int displayId);

    oneway void showInputMethodPickerFromSystem(int auxiliarySubtypeMode, int displayId);





    @EnforcePermission("TEST_INPUT_METHOD")

    @EnforcePermission("TEST_INPUT_METHOD")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -228,7 +228,7 @@ final class ZeroJankProxy implements IInputMethodManagerImpl.Callback { 
    @Override

    @Override

    public void showInputMethodPickerFromClient(IInputMethodClient client,

    public void showInputMethodPickerFromClient(IInputMethodClient client,

            int auxiliarySubtypeMode) {

            int auxiliarySubtypeMode) {

        offload(() -> mInner.showInputMethodPickerFromClient(client, auxiliarySubtypeMode));

        mInner.showInputMethodPickerFromClient(client, auxiliarySubtypeMode);

    }

    }





    @IInputMethodManagerImpl.PermissionVerified(allOf = {

    @IInputMethodManagerImpl.PermissionVerified(allOf = {