Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finish renaming requestUpdateCursorAnchorInfo() to requestCursorUpdates()"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-19 21:45:34 +00:00
committed by Android (Google) Code Review
parent 3eeb4849c4 ca490fc879
commit 83fbe443dd
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/inputmethodservice/RemoteInputConnection.java
View File

@@ -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;
}

7
core/java/com/android/internal/inputmethod/IInputContextInvoker.java
View File

@@ -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));
}

8
core/java/com/android/internal/view/IInputConnectionWrapper.java
View File

@@ -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;

2
core/java/com/android/internal/view/IInputContext.aidl
View File

@@ -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);