diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 48d3686360f0a..1965e55daae1d 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -3319,7 +3319,7 @@ public class InputMethodService extends AbstractInputMethodService { if (mNotifyUserActionSent) { return; } - mPrivOps.notifyUserAction(); + mPrivOps.notifyUserActionAsync(); mNotifyUserActionSent = true; } } diff --git a/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl b/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl index 070e6abb36e62..0b8598a28b58e 100644 --- a/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl +++ b/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl @@ -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); } diff --git a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java index 2fc8d7a5676c1..345a958183c2d 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java +++ b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java @@ -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(); } diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 6282aa69dbc4b..5f8e7078c81b6 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -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