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

Remove unnecessary "I" from IIInputContentUriTokenResultCallback

Browse Source 
This is a mechanical refactoring CL that does nothing but remaning

  IIInputContentUriTokenResultCallback

to

  IInputContentUriTokenResultCallback.

There should be no observable behavior change in this CL.

Bug: 173340613
Bug: 194308519
Test: presubmit
Change-Id: Id37fd7c44145934aea42d7944e5b212c6ff543f6
This commit is contained in:
Yohei Yukawa
2021-07-23 08:52:11 -07:00
parent 1afbd902cb
commit b72545e7b1
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/inputmethod/CallbackUtils.java
View File

@@ -116,13 +116,13 @@ public final class CallbackUtils {
}
/**
* A utility method using given {@link IIInputContentUriTokenResultCallback} to callback the
* A utility method using given {@link IInputContentUriTokenResultCallback} to callback the
* result.
*
* @param callback {@link IIInputContentUriTokenResultCallback} to be called back.
* @param callback {@link IInputContentUriTokenResultCallback} to be called back.
* @param resultSupplier the supplier from which the result is provided.
*/
public static void onResult(@NonNull IIInputContentUriTokenResultCallback callback,
public static void onResult(@NonNull IInputContentUriTokenResultCallback callback,
@NonNull Supplier<IInputContentUriToken> resultSupplier) {
IInputContentUriToken result = null;
Throwable exception = null;

2
core/java/com/android/internal/inputmethod/IIInputContentUriTokenResultCallback.aidl → core/java/com/android/internal/inputmethod/IInputContentUriTokenResultCallback.aidl
View File

@@ -19,7 +19,7 @@ package com.android.internal.inputmethod;
import com.android.internal.inputmethod.IInputContentUriToken;
import com.android.internal.inputmethod.ThrowableHolder;
oneway interface IIInputContentUriTokenResultCallback {
oneway interface IInputContentUriTokenResultCallback {
void onResult(in IInputContentUriToken result);
void onError(in ThrowableHolder exception);
}

4
core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl
View File

@@ -21,7 +21,7 @@ import android.view.inputmethod.InputMethodSubtype;
import com.android.internal.inputmethod.IBooleanResultCallback;
import com.android.internal.inputmethod.IInputContentUriToken;
import com.android.internal.inputmethod.IIInputContentUriTokenResultCallback;
import com.android.internal.inputmethod.IInputContentUriTokenResultCallback;
import com.android.internal.inputmethod.IVoidResultCallback;
/**
@@ -32,7 +32,7 @@ oneway interface IInputMethodPrivilegedOperations {
void setImeWindowStatusAsync(int vis, int backDisposition);
void reportStartInputAsync(in IBinder startInputToken);
void createInputContentUriToken(in Uri contentUri, in String packageName,
in IIInputContentUriTokenResultCallback resultCallback);
in IInputContentUriTokenResultCallback resultCallback);
void reportFullscreenModeAsync(boolean fullscreen);
void setInputMethod(String id, in IVoidResultCallback resultCallback);
void setInputMethodAndSubtype(String id, in InputMethodSubtype subtype,

2
core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java
View File

@@ -142,7 +142,7 @@ public final class InputMethodPrivilegedOperations {
/**
* Calls {@link IInputMethodPrivilegedOperations#createInputContentUriToken(Uri, String,
* IIInputContentUriTokenResultCallback)}.
* IInputContentUriTokenResultCallback)}.
*
* @param contentUri Content URI to which a temporary read permission should be granted
* @param packageName Indicates what package needs to have a temporary read permission

8
core/java/com/android/internal/inputmethod/ResultCallbacks.java
View File

@@ -223,20 +223,20 @@ public final class ResultCallbacks {
}
/**
* Creates {@link IIInputContentUriTokenResultCallback.Stub} that is to set
* Creates {@link IInputContentUriTokenResultCallback.Stub} that is to set
* {@link Completable.IInputContentUriToken} when receiving the result.
*
* @param value {@link Completable.IInputContentUriToken} to be set when receiving the result.
* @return {@link IIInputContentUriTokenResultCallback.Stub} that can be passed as a binder IPC
* @return {@link IInputContentUriTokenResultCallback.Stub} that can be passed as a binder IPC
* parameter.
*/
@AnyThread
public static IIInputContentUriTokenResultCallback.Stub of(
public static IInputContentUriTokenResultCallback.Stub of(
@NonNull Completable.IInputContentUriToken value) {
final AtomicReference<Completable.IInputContentUriToken>
atomicRef = new AtomicReference<>(value);
return new IIInputContentUriTokenResultCallback.Stub() {
return new IInputContentUriTokenResultCallback.Stub() {
@BinderThread
@Override
public void onResult(IInputContentUriToken result) {

4
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -154,8 +154,8 @@ import com.android.internal.compat.IPlatformCompat;
import com.android.internal.content.PackageMonitor;
import com.android.internal.inputmethod.CallbackUtils;
import com.android.internal.inputmethod.IBooleanResultCallback;
import com.android.internal.inputmethod.IIInputContentUriTokenResultCallback;
import com.android.internal.inputmethod.IInputContentUriToken;
import com.android.internal.inputmethod.IInputContentUriTokenResultCallback;
import com.android.internal.inputmethod.IInputMethodPrivilegedOperations;
import com.android.internal.inputmethod.IVoidResultCallback;
import com.android.internal.inputmethod.ImeTracing;
@@ -5831,7 +5831,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
@BinderThread
@Override
public void createInputContentUriToken(Uri contentUri, String packageName,
IIInputContentUriTokenResultCallback resultCallback) {
IInputContentUriTokenResultCallback resultCallback) {
CallbackUtils.onResult(resultCallback,
() -> mImms.createInputContentUriToken(mToken, contentUri, packageName));
}