summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yohei Yukawa <yukawa@google.com> 2022-07-27 09:34:57 +0900
committer Yohei Yukawa <yukawa@google.com> 2022-07-27 09:34:57 +0900
commit324b546ab6288302f5d187fcc26b968d8b4fd74a (patch)
tree44d510284efbb9ca7f47cd284bb18e127e35b181
parent9f01b9b36f3b10223be08f3c74c89f4b73f7147d (diff)
Inline IMMS#startInputOrWindowGainedFocusInternal
This is a follow up CL to my previous CL [1], which aimed to be a logical revert of changes mentioned in the commit message. One thing that CL forgot to handle was InputMethodManagerService#startInputOrWindowGainedFocusInternal, which was mentioned in one of our previous CLs [2]. This CL inlines that method again for simplicity. This is a mechanical refactoring. There should be no behavior change. [1]: If16ac0de536d9089eb04f6e07b1ee47378124658 662b48b72d841119160ab5c1b03be1ea36f3351d [2]: Ic584203c1221fbae17f5e2d8f09e3992df061646 5e2d9f271d1f24fc946661579628fb9a817143dc Bug: 234882948 Test: presubmit Change-Id: I7c775245882815483f29acfd83f53b08a40d07ed
-rw-r--r--services/core/java/com/android/server/inputmethod/InputMethodManagerService.java15
1 files changed, 0 insertions, 15 deletions
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index dd02f23e9150..dea13f948aa9 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -3576,21 +3576,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
IRemoteAccessibilityInputConnection remoteAccessibilityInputConnection,
int unverifiedTargetSdkVersion,
@NonNull ImeOnBackInvokedDispatcher imeDispatcher) {
- return startInputOrWindowGainedFocusInternal(startInputReason, client, windowToken,
- startInputFlags, softInputMode, windowFlags, editorInfo, inputConnection,
- remoteAccessibilityInputConnection, unverifiedTargetSdkVersion,
- imeDispatcher);
- }
-
- @NonNull
- private InputBindResult startInputOrWindowGainedFocusInternal(
- @StartInputReason int startInputReason, IInputMethodClient client, IBinder windowToken,
- @StartInputFlags int startInputFlags, @SoftInputModeFlags int softInputMode,
- int windowFlags, @Nullable EditorInfo editorInfo,
- @Nullable IRemoteInputConnection inputConnection,
- @Nullable IRemoteAccessibilityInputConnection remoteAccessibilityInputConnection,
- int unverifiedTargetSdkVersion,
- @NonNull ImeOnBackInvokedDispatcher imeDispatcher) {
if (windowToken == null) {
Slog.e(TAG, "windowToken cannot be null.");
return InputBindResult.NULL;