From 2fddead57de8a11ddb8cd81577b0c9a85ed9fdc7 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Mon, 13 Jun 2022 18:28:40 -0700
Subject: [PATCH] Move IRemoteInputConnectionInvoker to
 android.inputmethodservice

IRemoteInputConnectionInvoker is used only from RemoteInputConnection,
which is already placed under android.inputmethodservice as a
package-private class.  Let's also move IRemoteInputConnectionInvoker
to android.inputmethodservice as a package-private class to minimize
its visibility.

This is a mechanical refactoring, which should have no user/developer
observable behavior change.

Bug: 234882948
Test: presubmit
Change-Id: Ie946993aeedc31a67e3074dc591245f75143a9f1
---
 .../inputmethodservice}/IRemoteInputConnectionInvoker.java  | 6 ++++--
 .../android/inputmethodservice/RemoteInputConnection.java   | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename core/java/{com/android/internal/inputmethod => android/inputmethodservice}/IRemoteInputConnectionInvoker.java (99%)

diff --git a/core/java/com/android/internal/inputmethod/IRemoteInputConnectionInvoker.java b/core/java/android/inputmethodservice/IRemoteInputConnectionInvoker.java
similarity index 99%
rename from core/java/com/android/internal/inputmethod/IRemoteInputConnectionInvoker.java
rename to core/java/android/inputmethodservice/IRemoteInputConnectionInvoker.java
index b10a8c8f96d2c..e38e611227865 100644
--- a/core/java/com/android/internal/inputmethod/IRemoteInputConnectionInvoker.java
+++ b/core/java/android/inputmethodservice/IRemoteInputConnectionInvoker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.internal.inputmethod;
+package android.inputmethodservice;
 
 import android.annotation.AnyThread;
 import android.annotation.NonNull;
@@ -31,6 +31,8 @@ import android.view.inputmethod.SurroundingText;
 import android.view.inputmethod.TextAttribute;
 
 import com.android.internal.infra.AndroidFuture;
+import com.android.internal.inputmethod.IRemoteInputConnection;
+import com.android.internal.inputmethod.InputConnectionCommandHeader;
 
 import java.util.Objects;
 
@@ -38,7 +40,7 @@ import java.util.Objects;
  * A stateless wrapper of {@link com.android.internal.inputmethod.IRemoteInputConnection} to
  * encapsulate boilerplate code around {@link AndroidFuture} and {@link RemoteException}.
  */
-public final class IRemoteInputConnectionInvoker {
+final class IRemoteInputConnectionInvoker {
 
     @NonNull
     private final IRemoteInputConnection mConnection;
diff --git a/core/java/android/inputmethodservice/RemoteInputConnection.java b/core/java/android/inputmethodservice/RemoteInputConnection.java
index 26d2d9eb1063b..2711c4f0db1f5 100644
--- a/core/java/android/inputmethodservice/RemoteInputConnection.java
+++ b/core/java/android/inputmethodservice/RemoteInputConnection.java
@@ -36,7 +36,6 @@ import android.view.inputmethod.TextAttribute;
 import com.android.internal.inputmethod.CancellationGroup;
 import com.android.internal.inputmethod.CompletableFutureUtil;
 import com.android.internal.inputmethod.IRemoteInputConnection;
-import com.android.internal.inputmethod.IRemoteInputConnectionInvoker;
 import com.android.internal.inputmethod.ImeTracing;
 import com.android.internal.inputmethod.InputConnectionProtoDumper;