From ca490fc87912d6abdf69944d8ac3198654fb4dca Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Sun, 18 Jul 2021 23:38:16 -0700 Subject: [PATCH] Finish renaming requestUpdateCursorAnchorInfo() to requestCursorUpdates() This is a follow up CL to my previous CL [1] in Android L, which renamed InputConnection#requestUpdateCursorAnchorInfo() to InputConnection#requestCursorUpdates() per API council feedback before that API was finally published. Although its API surface has been correctly renamed, there have been several uses of its older name in our internal code. This CL also updates such internal uses to avoid confusions. As this is a purely mechanical renaming, there should be no behavior change in this CL. [1]: I772c48ff18918e48a81e807b48ff907614485c09 d8636ea7ca78df83d6b04088eab7853f15f3e999 Bug: 192412909 Test: atest Change-Id: I75701a5a32d52283497208013c28ceb75c1adfa9 --- .../android/inputmethodservice/RemoteInputConnection.java | 4 ++-- .../internal/inputmethod/IInputContextInvoker.java | 7 +++---- .../android/internal/view/IInputConnectionWrapper.java | 8 ++++---- core/java/com/android/internal/view/IInputContext.aidl | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/core/java/android/inputmethodservice/RemoteInputConnection.java b/core/java/android/inputmethodservice/RemoteInputConnection.java index 4fa98be75b46c..7363c50dd71ab 100644 --- a/core/java/android/inputmethodservice/RemoteInputConnection.java +++ b/core/java/android/inputmethodservice/RemoteInputConnection.java @@ -361,8 +361,8 @@ final class RemoteInputConnection implements InputConnection { // This method is not implemented. return false; } - final Completable.Int value = mInvoker.requestUpdateCursorAnchorInfo(cursorUpdateMode); - return Completable.getResultOrZero(value, TAG, "requestUpdateCursorAnchorInfo()", + final Completable.Int value = mInvoker.requestCursorUpdates(cursorUpdateMode); + return Completable.getResultOrZero(value, TAG, "requestCursorUpdates()", mCancellationGroup, MAX_WAIT_TIME_MILLIS) != 0; } diff --git a/core/java/com/android/internal/inputmethod/IInputContextInvoker.java b/core/java/com/android/internal/inputmethod/IInputContextInvoker.java index 2ad1373b07b08..e9df9a1863ff1 100644 --- a/core/java/com/android/internal/inputmethod/IInputContextInvoker.java +++ b/core/java/com/android/internal/inputmethod/IInputContextInvoker.java @@ -471,7 +471,7 @@ public final class IInputContextInvoker { } /** - * Invokes {@link IInputContext#requestUpdateCursorAnchorInfo(int, IIntResultCallback)}. + * Invokes {@link IInputContext#requestCursorUpdates(int, IIntResultCallback)}. * * @param cursorUpdateMode {@code cursorUpdateMode} parameter to be passed. * @return {@link Completable.Int} that can be used to retrieve the invocation result. @@ -479,11 +479,10 @@ public final class IInputContextInvoker { */ @AnyThread @NonNull - public Completable.Int requestUpdateCursorAnchorInfo(int cursorUpdateMode) { + public Completable.Int requestCursorUpdates(int cursorUpdateMode) { final Completable.Int value = Completable.createInt(); try { - mIInputContext.requestUpdateCursorAnchorInfo(cursorUpdateMode, - ResultCallbacks.of(value)); + mIInputContext.requestCursorUpdates(cursorUpdateMode, ResultCallbacks.of(value)); } catch (RemoteException e) { value.onError(ThrowableHolder.of(e)); } diff --git a/core/java/com/android/internal/view/IInputConnectionWrapper.java b/core/java/com/android/internal/view/IInputConnectionWrapper.java index 6d1b4cb2d49f9..125ec0720cc4d 100644 --- a/core/java/com/android/internal/view/IInputConnectionWrapper.java +++ b/core/java/com/android/internal/view/IInputConnectionWrapper.java @@ -79,7 +79,7 @@ public final class IInputConnectionWrapper extends IInputContext.Stub { private static final int DO_PERFORM_SPELL_CHECK = 110; private static final int DO_PERFORM_PRIVATE_COMMAND = 120; private static final int DO_CLEAR_META_KEY_STATES = 130; - private static final int DO_REQUEST_UPDATE_CURSOR_ANCHOR_INFO = 140; + private static final int DO_REQUEST_CURSOR_UPDATES = 140; private static final int DO_CLOSE_CONNECTION = 150; private static final int DO_COMMIT_CONTENT = 160; private static final int DO_GET_SURROUNDING_TEXT = 41; @@ -309,8 +309,8 @@ public final class IInputConnectionWrapper extends IInputContext.Stub { dispatchMessage(obtainMessageOO(DO_PERFORM_PRIVATE_COMMAND, action, data)); } - public void requestUpdateCursorAnchorInfo(int cursorUpdateMode, IIntResultCallback callback) { - dispatchMessage(mH.obtainMessage(DO_REQUEST_UPDATE_CURSOR_ANCHOR_INFO, cursorUpdateMode, + public void requestCursorUpdates(int cursorUpdateMode, IIntResultCallback callback) { + dispatchMessage(mH.obtainMessage(DO_REQUEST_CURSOR_UPDATES, cursorUpdateMode, 0 /* unused */, callback)); } @@ -794,7 +794,7 @@ public final class IInputConnectionWrapper extends IInputContext.Stub { } return; } - case DO_REQUEST_UPDATE_CURSOR_ANCHOR_INFO: { + case DO_REQUEST_CURSOR_UPDATES: { Trace.traceBegin(Trace.TRACE_TAG_INPUT, "InputConnection#requestCursorUpdates"); try { final IIntResultCallback callback = (IIntResultCallback) msg.obj; diff --git a/core/java/com/android/internal/view/IInputContext.aidl b/core/java/com/android/internal/view/IInputContext.aidl index b06b4e5351c24..be1dbabdeab87 100644 --- a/core/java/com/android/internal/view/IInputContext.aidl +++ b/core/java/com/android/internal/view/IInputContext.aidl @@ -78,7 +78,7 @@ import com.android.internal.inputmethod.ISurroundingTextResultCallback; void getSelectedText(int flags, ICharSequenceResultCallback callback); - void requestUpdateCursorAnchorInfo(int cursorUpdateMode, IIntResultCallback callback); + void requestCursorUpdates(int cursorUpdateMode, IIntResultCallback callback); void commitContent(in InputContentInfo inputContentInfo, int flags, in Bundle opts, IIntResultCallback callback);