diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 4ee5383a56be0..ad5c21295e15e 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -1628,7 +1628,7 @@ public class InputMethodService extends AbstractInputMethodService { } private void reportFullscreenMode() { - mPrivOps.reportFullscreenMode(mIsFullscreen); + mPrivOps.reportFullscreenModeAsync(mIsFullscreen); } /** diff --git a/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl b/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl index 20e520efc7613..e6ace331f23af 100644 --- a/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl +++ b/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl @@ -33,7 +33,7 @@ oneway interface IInputMethodPrivilegedOperations { void reportStartInput(in IBinder startInputToken, in IVoidResultCallback resultCallback); void createInputContentUriToken(in Uri contentUri, in String packageName, in IIInputContentUriTokenResultCallback resultCallback); - void reportFullscreenMode(boolean fullscreen, in IVoidResultCallback resultCallback); + void reportFullscreenModeAsync(boolean fullscreen); void setInputMethod(String id, in IVoidResultCallback resultCallback); void setInputMethodAndSubtype(String id, in InputMethodSubtype subtype, in IVoidResultCallback resultCallback); diff --git a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java index 10009140a7c0e..c2760a5cca446 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java +++ b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java @@ -172,21 +172,18 @@ public final class InputMethodPrivilegedOperations { } /** - * Calls {@link IInputMethodPrivilegedOperations#reportFullscreenMode(boolean, - * IVoidResultCallback)}. + * Calls {@link IInputMethodPrivilegedOperations#reportFullscreenModeAsync(boolean)}. * * @param fullscreen {@code true} if the IME enters full screen mode */ @AnyThread - public void reportFullscreenMode(boolean fullscreen) { + public void reportFullscreenModeAsync(boolean fullscreen) { final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull(); if (ops == null) { return; } try { - final Completable.Void value = Completable.createVoid(); - ops.reportFullscreenMode(fullscreen, ResultCallbacks.of(value)); - Completable.getResult(value); + ops.reportFullscreenModeAsync(fullscreen); } 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 7994fccbd650c..2b9c086670289 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -6007,9 +6007,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub @BinderThread @Override - public void reportFullscreenMode(boolean fullscreen, IVoidResultCallback resultCallback) { - CallbackUtils.onResult(resultCallback, - () -> mImms.reportFullscreenMode(mToken, fullscreen)); + public void reportFullscreenModeAsync(boolean fullscreen) { + mImms.reportFullscreenMode(mToken, fullscreen); } @BinderThread