From f3023dade468d1cbc0cc5e0f22f849ae25b4f3d1 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Thu, 29 Sep 2022 15:38:14 -0700 Subject: [PATCH] Make RemoteInputConnectionImpl package-private This CL mechanically moves RemoteInputConnectionImpl from com.android.internal.inputmethod to android.view.inputmethod just to make it a package-private class, as it is (and should be) used only by InputMethodManager. This is a mechanical refactoring. There must be no developer observable behavior change in this CL. Bug: 192412909 Test: presubmit Change-Id: I2d9bd4a5cb39d506a70331c9c930a74580cdbfa0 --- .../RemoteInputConnection.java | 2 +- .../view/inputmethod/InputMethodManager.java | 1 - .../RemoteInputConnectionImpl.java | 27 +++++-------------- .../InputConnectionCommandHeader.java | 2 +- 4 files changed, 9 insertions(+), 23 deletions(-) rename core/java/{com/android/internal => android/view}/inputmethod/RemoteInputConnectionImpl.java (98%) diff --git a/core/java/android/inputmethodservice/RemoteInputConnection.java b/core/java/android/inputmethodservice/RemoteInputConnection.java index 2b5f14d530e8d..09e86c4c96501 100644 --- a/core/java/android/inputmethodservice/RemoteInputConnection.java +++ b/core/java/android/inputmethodservice/RemoteInputConnection.java @@ -50,7 +50,7 @@ import java.util.function.IntConsumer; * Takes care of remote method invocations of {@link InputConnection} in the IME side. * *

This class works as a proxy to forward API calls on {@link InputConnection} to - * {@link com.android.internal.inputmethod.RemoteInputConnectionImpl} running on the IME client + * {@link android.view.inputmethod.RemoteInputConnectionImpl} running on the IME client * (editor app) process then waits replies as needed.

* *

See also {@link IRemoteInputConnection} for the actual {@link android.os.Binder} IPC protocols diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 7794b7c90303c..4b28d08c4a6dc 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -107,7 +107,6 @@ import com.android.internal.inputmethod.ImeTracing; import com.android.internal.inputmethod.InputBindResult; import com.android.internal.inputmethod.InputMethodDebug; import com.android.internal.inputmethod.InputMethodPrivilegedOperationsRegistry; -import com.android.internal.inputmethod.RemoteInputConnectionImpl; import com.android.internal.inputmethod.SoftInputShowHideReason; import com.android.internal.inputmethod.StartInputFlags; import com.android.internal.inputmethod.StartInputReason; diff --git a/core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java b/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java similarity index 98% rename from core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java rename to core/java/android/view/inputmethod/RemoteInputConnectionImpl.java index fcaa1e1c330e4..9376878152004 100644 --- a/core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java +++ b/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.inputmethod; +package android.view.inputmethod; import static com.android.internal.inputmethod.InputConnectionProtoDumper.buildGetCursorCapsModeProto; import static com.android.internal.inputmethod.InputConnectionProtoDumper.buildGetExtractedTextProto; @@ -38,26 +38,13 @@ import android.util.proto.ProtoOutputStream; import android.view.KeyEvent; import android.view.View; import android.view.ViewRootImpl; -import android.view.inputmethod.CompletionInfo; -import android.view.inputmethod.CorrectionInfo; -import android.view.inputmethod.DeleteGesture; -import android.view.inputmethod.DeleteRangeGesture; -import android.view.inputmethod.DumpableInputConnection; -import android.view.inputmethod.ExtractedTextRequest; -import android.view.inputmethod.HandwritingGesture; -import android.view.inputmethod.InputConnection; -import android.view.inputmethod.InputContentInfo; -import android.view.inputmethod.InputMethodManager; -import android.view.inputmethod.InsertGesture; -import android.view.inputmethod.JoinOrSplitGesture; -import android.view.inputmethod.RemoveSpaceGesture; -import android.view.inputmethod.SelectGesture; -import android.view.inputmethod.SelectRangeGesture; -import android.view.inputmethod.TextAttribute; -import android.view.inputmethod.TextSnapshot; import com.android.internal.annotations.GuardedBy; import com.android.internal.infra.AndroidFuture; +import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; +import com.android.internal.inputmethod.IRemoteInputConnection; +import com.android.internal.inputmethod.ImeTracing; +import com.android.internal.inputmethod.InputConnectionCommandHeader; import java.lang.annotation.Retention; import java.lang.ref.WeakReference; @@ -82,7 +69,7 @@ import java.util.function.Supplier; * (editor app) process, and forwards them to {@link InputConnection} that the IME client provided, * on the {@link Looper} associated to the {@link InputConnection}.

*/ -public final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { +final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { private static final String TAG = "RemoteInputConnectionImpl"; private static final boolean DEBUG = false; @@ -189,7 +176,7 @@ public final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub private final AtomicBoolean mHasPendingImmediateCursorAnchorInfoUpdate = new AtomicBoolean(false); - public RemoteInputConnectionImpl(@NonNull Looper looper, + RemoteInputConnectionImpl(@NonNull Looper looper, @NonNull InputConnection inputConnection, @NonNull InputMethodManager inputMethodManager, @Nullable View servedView) { mInputConnection = inputConnection; diff --git a/core/java/com/android/internal/inputmethod/InputConnectionCommandHeader.java b/core/java/com/android/internal/inputmethod/InputConnectionCommandHeader.java index 59121771a697e..a82c6dc2b6c01 100644 --- a/core/java/com/android/internal/inputmethod/InputConnectionCommandHeader.java +++ b/core/java/com/android/internal/inputmethod/InputConnectionCommandHeader.java @@ -21,7 +21,7 @@ import android.os.Parcel; import android.os.Parcelable; /** - * A common IPC header used behind {@link RemoteInputConnectionImpl} and + * A common IPC header used behind {@link android.view.inputmethod.RemoteInputConnectionImpl} and * {@link android.inputmethodservice.RemoteInputConnection}. */ public final class InputConnectionCommandHeader implements Parcelable {