From 2903b9da071ce2089131dfe0aba9cdc65a3d1729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosmin=20B=C4=83ie=C8=99?= Date: Thu, 23 Feb 2023 15:42:58 +0100 Subject: [PATCH] Move IImeTracker from view to inputmethod Test: build and run; filter logcat for ImeTracker tag and ensure logs are getting created Bug: 270549048 Change-Id: I59db19c58b3f35004fdb739e69aa9453c7d1777f --- .../view/inputmethod/IInputMethodManagerGlobalInvoker.java | 2 +- .../com/android/internal/{view => inputmethod}/IImeTracker.aidl | 2 +- core/java/com/android/internal/view/IInputMethodManager.aidl | 2 +- .../java/com/android/server/inputmethod/ImeTrackerService.java | 2 +- .../android/server/inputmethod/InputMethodManagerService.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename core/java/com/android/internal/{view => inputmethod}/IImeTracker.aidl (98%) diff --git a/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java b/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java index 71d956c2880e1..ba13968bbe943 100644 --- a/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java +++ b/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java @@ -34,6 +34,7 @@ import android.view.WindowManager; import android.window.ImeOnBackInvokedDispatcher; import com.android.internal.inputmethod.DirectBootAwareness; +import com.android.internal.inputmethod.IImeTracker; import com.android.internal.inputmethod.IInputMethodClient; import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; import com.android.internal.inputmethod.IRemoteInputConnection; @@ -41,7 +42,6 @@ import com.android.internal.inputmethod.InputBindResult; import com.android.internal.inputmethod.SoftInputShowHideReason; import com.android.internal.inputmethod.StartInputFlags; import com.android.internal.inputmethod.StartInputReason; -import com.android.internal.view.IImeTracker; import com.android.internal.view.IInputMethodManager; import java.util.ArrayList; diff --git a/core/java/com/android/internal/view/IImeTracker.aidl b/core/java/com/android/internal/inputmethod/IImeTracker.aidl similarity index 98% rename from core/java/com/android/internal/view/IImeTracker.aidl rename to core/java/com/android/internal/inputmethod/IImeTracker.aidl index 1e0eca48e39be..c7418ee36fff9 100644 --- a/core/java/com/android/internal/view/IImeTracker.aidl +++ b/core/java/com/android/internal/inputmethod/IImeTracker.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.view; +package com.android.internal.inputmethod; import android.view.inputmethod.ImeTracker; diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index 9116cb3ec9fa2..6ea924f3bce0f 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -23,11 +23,11 @@ import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.EditorInfo; import android.window.ImeOnBackInvokedDispatcher; +import com.android.internal.inputmethod.IImeTracker; import com.android.internal.inputmethod.IInputMethodClient; import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.inputmethod.InputBindResult; -import com.android.internal.view.IImeTracker; /** * Public interface to the global input method manager, used by all client diff --git a/services/core/java/com/android/server/inputmethod/ImeTrackerService.java b/services/core/java/com/android/server/inputmethod/ImeTrackerService.java index 8dd400f3463ae..2efb0beaa567d 100644 --- a/services/core/java/com/android/server/inputmethod/ImeTrackerService.java +++ b/services/core/java/com/android/server/inputmethod/ImeTrackerService.java @@ -28,10 +28,10 @@ import android.util.Log; import android.view.inputmethod.ImeTracker; import com.android.internal.annotations.GuardedBy; +import com.android.internal.inputmethod.IImeTracker; import com.android.internal.inputmethod.InputMethodDebug; import com.android.internal.inputmethod.SoftInputShowHideReason; import com.android.internal.util.FrameworkStatsLog; -import com.android.internal.view.IImeTracker; import java.io.PrintWriter; import java.time.Instant; diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 8b754c902e355..6ca7eda276a13 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -145,6 +145,7 @@ import com.android.internal.content.PackageMonitor; import com.android.internal.infra.AndroidFuture; import com.android.internal.inputmethod.DirectBootAwareness; import com.android.internal.inputmethod.IAccessibilityInputMethodSession; +import com.android.internal.inputmethod.IImeTracker; import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; import com.android.internal.inputmethod.IInputContentUriToken; import com.android.internal.inputmethod.IInputMethod; @@ -168,7 +169,6 @@ import com.android.internal.os.TransferPipe; import com.android.internal.util.ArrayUtils; import com.android.internal.util.ConcurrentUtils; import com.android.internal.util.DumpUtils; -import com.android.internal.view.IImeTracker; import com.android.internal.view.IInputMethodManager; import com.android.server.AccessibilityManagerInternal; import com.android.server.EventLogTags;