From fd1580e341470aa355f2edbfdf0dc5e3134c5555 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Fri, 10 Jun 2022 10:51:07 -0700 Subject: [PATCH] Move IInputMethodSession to com.android.internal.inputmethod This CL Moves IInputMethodSession from com.android.internal.view to com.android.internal.inputmethod to be consistent with other IME-related files. This CL also moves IInputSessionCallback to com.android.internal.inputmethod with renaming it to IInputMethodSessionCallback for consistency. This is just a renaming CL of implementation details. There should be no user/developer observable behavior change in this CL. Bug: 234882948 Test: presubmit Change-Id: I87495cbd482dd55005ac8d948f57f32bb016c7d6 --- .../IInputMethodSessionWrapper.java | 2 +- .../IInputMethodWrapper.java | 14 +++++----- .../view/inputmethod/InputMethodManager.java | 2 +- .../InputMethodSessionWrapper.java | 2 +- .../IInputMethodSession.aidl | 2 +- .../IInputMethodSessionCallback.aidl} | 6 ++--- .../internal/inputmethod/InputBindResult.java | 2 -- .../inputmethod/StartInputReason.java | 2 +- .../android/internal/view/IInputMethod.aidl | 6 ++--- .../inputmethod/IInputMethodInvoker.java | 6 ++--- .../InputMethodManagerService.java | 27 ++++++++++--------- 11 files changed, 35 insertions(+), 36 deletions(-) rename core/java/com/android/internal/{view => inputmethod}/IInputMethodSession.aidl (97%) rename core/java/com/android/internal/{view/IInputSessionCallback.aidl => inputmethod/IInputMethodSessionCallback.aidl} (84%) diff --git a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java index 48373148ccec1..62b131af74fe0 100644 --- a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java @@ -36,10 +36,10 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.ExtractedText; import android.view.inputmethod.InputMethodSession; +import com.android.internal.inputmethod.IInputMethodSession; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.os.HandlerCaller; import com.android.internal.os.SomeArgs; -import com.android.internal.view.IInputMethodSession; class IInputMethodSessionWrapper extends IInputMethodSession.Stub implements HandlerCaller.Callback { diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index bb3a19d58499c..9517f36040b07 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -41,14 +41,14 @@ import android.window.ImeOnBackInvokedDispatcher; import com.android.internal.inputmethod.CancellationGroup; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; +import com.android.internal.inputmethod.IInputMethodSession; +import com.android.internal.inputmethod.IInputMethodSessionCallback; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.os.HandlerCaller; import com.android.internal.os.SomeArgs; import com.android.internal.view.IInlineSuggestionsRequestCallback; import com.android.internal.view.IInputMethod; -import com.android.internal.view.IInputMethodSession; -import com.android.internal.view.IInputSessionCallback; import com.android.internal.view.InlineSuggestionsRequestInfo; import java.io.FileDescriptor; @@ -110,10 +110,10 @@ class IInputMethodWrapper extends IInputMethod.Stub static final class InputMethodSessionCallbackWrapper implements InputMethod.SessionCallback { final Context mContext; final InputChannel mChannel; - final IInputSessionCallback mCb; + final IInputMethodSessionCallback mCb; InputMethodSessionCallbackWrapper(Context context, InputChannel channel, - IInputSessionCallback cb) { + IInputMethodSessionCallback cb) { mContext = context; mChannel = channel; mCb = cb; @@ -219,8 +219,8 @@ class IInputMethodWrapper extends IInputMethod.Stub case DO_CREATE_SESSION: { SomeArgs args = (SomeArgs)msg.obj; inputMethod.createSession(new InputMethodSessionCallbackWrapper( - mContext, (InputChannel)args.arg1, - (IInputSessionCallback)args.arg2)); + mContext, (InputChannel) args.arg1, + (IInputMethodSessionCallback) args.arg2)); args.recycle(); return; } @@ -375,7 +375,7 @@ class IInputMethodWrapper extends IInputMethod.Stub @BinderThread @Override - public void createSession(InputChannel channel, IInputSessionCallback callback) { + public void createSession(InputChannel channel, IInputMethodSessionCallback callback) { mCaller.executeOrSendMessage(mCaller.obtainMessageOO(DO_CREATE_SESSION, channel, callback)); } diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 1e426a4063839..ee4d9d594ea52 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -97,6 +97,7 @@ import android.window.WindowOnBackInvokedDispatcher; import com.android.internal.annotations.GuardedBy; import com.android.internal.inputmethod.DirectBootAwareness; import com.android.internal.inputmethod.IInputMethodClient; +import com.android.internal.inputmethod.IInputMethodSession; import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; import com.android.internal.inputmethod.ImeTracing; import com.android.internal.inputmethod.InputBindResult; @@ -109,7 +110,6 @@ import com.android.internal.inputmethod.StartInputReason; import com.android.internal.inputmethod.UnbindReason; import com.android.internal.os.SomeArgs; import com.android.internal.view.IInputMethodManager; -import com.android.internal.view.IInputMethodSession; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/core/java/android/view/inputmethod/InputMethodSessionWrapper.java b/core/java/android/view/inputmethod/InputMethodSessionWrapper.java index 081a6e6388f7f..6e9323d6ee62b 100644 --- a/core/java/android/view/inputmethod/InputMethodSessionWrapper.java +++ b/core/java/android/view/inputmethod/InputMethodSessionWrapper.java @@ -24,8 +24,8 @@ import android.os.Bundle; import android.os.RemoteException; import android.util.Log; +import com.android.internal.inputmethod.IInputMethodSession; import com.android.internal.inputmethod.IRemoteInputConnection; -import com.android.internal.view.IInputMethodSession; /** * This class wrap the {@link IInputMethodSession} object from {@link InputMethodManager}. diff --git a/core/java/com/android/internal/view/IInputMethodSession.aidl b/core/java/com/android/internal/inputmethod/IInputMethodSession.aidl similarity index 97% rename from core/java/com/android/internal/view/IInputMethodSession.aidl rename to core/java/com/android/internal/inputmethod/IInputMethodSession.aidl index 2f8b3f5108bb6..7c18d8d50d47f 100644 --- a/core/java/com/android/internal/view/IInputMethodSession.aidl +++ b/core/java/com/android/internal/inputmethod/IInputMethodSession.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.view; +package com.android.internal.inputmethod; import android.graphics.Rect; import android.os.Bundle; diff --git a/core/java/com/android/internal/view/IInputSessionCallback.aidl b/core/java/com/android/internal/inputmethod/IInputMethodSessionCallback.aidl similarity index 84% rename from core/java/com/android/internal/view/IInputSessionCallback.aidl rename to core/java/com/android/internal/inputmethod/IInputMethodSessionCallback.aidl index 2b48f33cbdc00..4d07c79aeb981 100644 --- a/core/java/com/android/internal/view/IInputSessionCallback.aidl +++ b/core/java/com/android/internal/inputmethod/IInputMethodSessionCallback.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.internal.view; +package com.android.internal.inputmethod; -import com.android.internal.view.IInputMethodSession; +import com.android.internal.inputmethod.IInputMethodSession; /** * Helper interface for IInputMethod to allow the input method to notify the client when a new @@ -24,6 +24,6 @@ import com.android.internal.view.IInputMethodSession; * {@hide} */ -oneway interface IInputSessionCallback { +oneway interface IInputMethodSessionCallback { void sessionCreated(IInputMethodSession session); } diff --git a/core/java/com/android/internal/inputmethod/InputBindResult.java b/core/java/com/android/internal/inputmethod/InputBindResult.java index 10c83c34f417c..74c61d152f2f0 100644 --- a/core/java/com/android/internal/inputmethod/InputBindResult.java +++ b/core/java/com/android/internal/inputmethod/InputBindResult.java @@ -30,8 +30,6 @@ import android.os.Parcelable; import android.util.SparseArray; import android.view.InputChannel; -import com.android.internal.view.IInputMethodSession; - import java.lang.annotation.Retention; /** diff --git a/core/java/com/android/internal/inputmethod/StartInputReason.java b/core/java/com/android/internal/inputmethod/StartInputReason.java index 80d9287f26f06..806e069eda60f 100644 --- a/core/java/com/android/internal/inputmethod/StartInputReason.java +++ b/core/java/com/android/internal/inputmethod/StartInputReason.java @@ -95,7 +95,7 @@ public @interface StartInputReason { int DEACTIVATED_BY_IMMS = 9; /** * {@link com.android.server.inputmethod.InputMethodManagerService} is responding to - * {@link com.android.internal.view.IInputSessionCallback#sessionCreated}. + * {@link com.android.internal.view.IInputMethodSessionCallback#sessionCreated}. */ int SESSION_CREATED_BY_IME = 10; /** diff --git a/core/java/com/android/internal/view/IInputMethod.aidl b/core/java/com/android/internal/view/IInputMethod.aidl index d3b575af87429..ff1748854f51e 100644 --- a/core/java/com/android/internal/view/IInputMethod.aidl +++ b/core/java/com/android/internal/view/IInputMethod.aidl @@ -25,10 +25,10 @@ import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputMethodSubtype; import android.window.ImeOnBackInvokedDispatcher; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; +import com.android.internal.inputmethod.IInputMethodSession; +import com.android.internal.inputmethod.IInputMethodSessionCallback; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.IInputMethodSession; -import com.android.internal.view.IInputSessionCallback; import com.android.internal.view.InlineSuggestionsRequestInfo; /** @@ -53,7 +53,7 @@ oneway interface IInputMethod { void onNavButtonFlagsChanged(int navButtonFlags); - void createSession(in InputChannel channel, IInputSessionCallback callback); + void createSession(in InputChannel channel, IInputMethodSessionCallback callback); void setSessionEnabled(IInputMethodSession session, boolean enabled); diff --git a/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java b/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java index c719fb5009a81..051601c5b3ae9 100644 --- a/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java +++ b/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java @@ -33,12 +33,12 @@ import android.view.inputmethod.InputMethodSubtype; import android.window.ImeOnBackInvokedDispatcher; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; +import com.android.internal.inputmethod.IInputMethodSession; +import com.android.internal.inputmethod.IInputMethodSessionCallback; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.view.IInlineSuggestionsRequestCallback; import com.android.internal.view.IInputMethod; -import com.android.internal.view.IInputMethodSession; -import com.android.internal.view.IInputSessionCallback; import com.android.internal.view.InlineSuggestionsRequestInfo; import java.util.List; @@ -169,7 +169,7 @@ final class IInputMethodInvoker { } @AnyThread - void createSession(InputChannel channel, IInputSessionCallback callback) { + void createSession(InputChannel channel, IInputMethodSessionCallback callback) { try { mTarget.createSession(channel, callback); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 3d6b89b729d26..1429f526cc3f5 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -159,6 +159,8 @@ import com.android.internal.inputmethod.IAccessibilityInputMethodSession; import com.android.internal.inputmethod.IInputContentUriToken; import com.android.internal.inputmethod.IInputMethodClient; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; +import com.android.internal.inputmethod.IInputMethodSession; +import com.android.internal.inputmethod.IInputMethodSessionCallback; import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.inputmethod.ImeTracing; @@ -178,8 +180,6 @@ import com.android.internal.util.DumpUtils; import com.android.internal.view.IInlineSuggestionsRequestCallback; import com.android.internal.view.IInlineSuggestionsResponseCallback; import com.android.internal.view.IInputMethodManager; -import com.android.internal.view.IInputMethodSession; -import com.android.internal.view.IInputSessionCallback; import com.android.internal.view.InlineSuggestionsRequestInfo; import com.android.server.AccessibilityManagerInternal; import com.android.server.EventLogTags; @@ -3020,17 +3020,18 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub cs.sessionRequested = true; final IInputMethodInvoker curMethod = getCurMethodLocked(); - final IInputSessionCallback.Stub callback = new IInputSessionCallback.Stub() { - @Override - public void sessionCreated(IInputMethodSession session) { - final long ident = Binder.clearCallingIdentity(); - try { - onSessionCreated(curMethod, session, serverChannel); - } finally { - Binder.restoreCallingIdentity(ident); - } - } - }; + final IInputMethodSessionCallback.Stub callback = + new IInputMethodSessionCallback.Stub() { + @Override + public void sessionCreated(IInputMethodSession session) { + final long ident = Binder.clearCallingIdentity(); + try { + onSessionCreated(curMethod, session, serverChannel); + } finally { + Binder.restoreCallingIdentity(ident); + } + } + }; try { curMethod.createSession(clientChannel, callback);