From b72545e7b1a1277216628fc2abf99e41dd4a537e Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Fri, 23 Jul 2021 08:52:11 -0700 Subject: [PATCH] Remove unnecessary "I" from IIInputContentUriTokenResultCallback 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 --- .../com/android/internal/inputmethod/CallbackUtils.java | 6 +++--- ...back.aidl => IInputContentUriTokenResultCallback.aidl} | 2 +- .../inputmethod/IInputMethodPrivilegedOperations.aidl | 4 ++-- .../inputmethod/InputMethodPrivilegedOperations.java | 2 +- .../com/android/internal/inputmethod/ResultCallbacks.java | 8 ++++---- .../server/inputmethod/InputMethodManagerService.java | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) rename core/java/com/android/internal/inputmethod/{IIInputContentUriTokenResultCallback.aidl => IInputContentUriTokenResultCallback.aidl} (93%) diff --git a/core/java/com/android/internal/inputmethod/CallbackUtils.java b/core/java/com/android/internal/inputmethod/CallbackUtils.java index adeb46a48439d..2b9556d103cd8 100644 --- a/core/java/com/android/internal/inputmethod/CallbackUtils.java +++ b/core/java/com/android/internal/inputmethod/CallbackUtils.java @@ -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 resultSupplier) { IInputContentUriToken result = null; Throwable exception = null; diff --git a/core/java/com/android/internal/inputmethod/IIInputContentUriTokenResultCallback.aidl b/core/java/com/android/internal/inputmethod/IInputContentUriTokenResultCallback.aidl similarity index 93% rename from core/java/com/android/internal/inputmethod/IIInputContentUriTokenResultCallback.aidl rename to core/java/com/android/internal/inputmethod/IInputContentUriTokenResultCallback.aidl index 2e6d2247b51b5..779acb5a57b40 100644 --- a/core/java/com/android/internal/inputmethod/IIInputContentUriTokenResultCallback.aidl +++ b/core/java/com/android/internal/inputmethod/IInputContentUriTokenResultCallback.aidl @@ -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); } \ No newline at end of file diff --git a/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl b/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl index 11df5a89d8c0e..36943e3bd5917 100644 --- a/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl +++ b/core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl @@ -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, diff --git a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java index ed1fe1a6229e2..9fb0bb52e0011 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java +++ b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java @@ -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 diff --git a/core/java/com/android/internal/inputmethod/ResultCallbacks.java b/core/java/com/android/internal/inputmethod/ResultCallbacks.java index 6838cbda4ab9b..343a6e697c7c7 100644 --- a/core/java/com/android/internal/inputmethod/ResultCallbacks.java +++ b/core/java/com/android/internal/inputmethod/ResultCallbacks.java @@ -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 atomicRef = new AtomicReference<>(value); - return new IIInputContentUriTokenResultCallback.Stub() { + return new IInputContentUriTokenResultCallback.Stub() { @BinderThread @Override public void onResult(IInputContentUriToken result) { diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index de78becdcee4b..50d5b669abc91 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -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)); }