diff options
4 files changed, 7 insertions, 12 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index bf016124da31..4ee5383a56be 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -941,7 +941,7 @@ public class InputMethodService extends AbstractInputMethodService { } private void setImeWindowStatus(int visibilityFlags, int backDisposition) { - mPrivOps.setImeWindowStatus(visibilityFlags, backDisposition); + mPrivOps.setImeWindowStatusAsync(visibilityFlags, backDisposition); } /** Set region of the keyboard to be avoided from back gesture */ diff --git a/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl b/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl index e4dd7b0629b5..20e520efc761 100644 --- a/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl +++ b/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl @@ -29,7 +29,7 @@ import com.android.internal.inputmethod.IVoidResultCallback; * Actual operations are implemented and handled by InputMethodManagerService. */ oneway interface IInputMethodPrivilegedOperations { - void setImeWindowStatus(int vis, int backDisposition, in IVoidResultCallback resultCallback); + void setImeWindowStatusAsync(int vis, int backDisposition); void reportStartInput(in IBinder startInputToken, in IVoidResultCallback resultCallback); void createInputContentUriToken(in Uri contentUri, in String packageName, in IIInputContentUriTokenResultCallback resultCallback); diff --git a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java index 04cf3f3e546f..98c75b9ef428 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java +++ b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java @@ -95,8 +95,7 @@ public final class InputMethodPrivilegedOperations { } /** - * Calls {@link IInputMethodPrivilegedOperations#setImeWindowStatus(int, int, - * IVoidResultCallback)}. + * Calls {@link IInputMethodPrivilegedOperations#setImeWindowStatusAsync(int, int}. * * @param vis visibility flags * @param backDisposition disposition flags @@ -107,15 +106,13 @@ public final class InputMethodPrivilegedOperations { * @see android.inputmethodservice.InputMethodService#BACK_DISPOSITION_ADJUST_NOTHING */ @AnyThread - public void setImeWindowStatus(int vis, int backDisposition) { + public void setImeWindowStatusAsync(int vis, int backDisposition) { final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull(); if (ops == null) { return; } try { - final Completable.Void value = Completable.createVoid(); - ops.setImeWindowStatus(vis, backDisposition, ResultCallbacks.of(value)); - Completable.getResult(value); + ops.setImeWindowStatusAsync(vis, backDisposition); } 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 52401cfdee93..3ac11da5fb3b 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -5975,10 +5975,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub @BinderThread @Override - public void setImeWindowStatus(int vis, int backDisposition, - IVoidResultCallback resultCallback) { - CallbackUtils.onResult(resultCallback, - () -> mImms.setImeWindowStatus(mToken, vis, backDisposition)); + public void setImeWindowStatusAsync(int vis, int backDisposition) { + mImms.setImeWindowStatus(mToken, vis, backDisposition); } @BinderThread |