diff options
4 files changed, 7 insertions, 11 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 4b8e37c56061..5267aa81bdaf 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -1627,7 +1627,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 436596611f83..fcb5d3bb1bf0 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 reportStartInputAsync(in IBinder startInputToken); 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 555488d68866..1691e13fa567 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java +++ b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java @@ -169,21 +169,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 94a5099b45da..3ba17f509c94 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -6006,9 +6006,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 |