summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-07-25 19:31:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-07-25 19:31:43 +0000
commitd0a151b57c169e57dcf6434349d9866f6fa3f79a (patch)
tree22629dbe3fa855315a69fec628d51d36c71d7ef1
parent8a1783f1fd9e831c6ac4b45b573b30488fcec735 (diff)
parent755a500ccc2394a6a59ad24329261f36b51851dd (diff)
Merge "Fix two lint warnings in IMMS" into main
-rw-r--r--services/core/java/com/android/server/inputmethod/InputMethodManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index d2140f83fb27..0770c8e4f088 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -3023,8 +3023,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
return false;
}
- final long ident = Binder.clearCallingIdentity();
final var userData = getUserData(userId);
+ final long ident = Binder.clearCallingIdentity();
try {
if (DEBUG) Slog.v(TAG, "Client requesting input be shown");
if (Flags.refactorInsetsController()) {
@@ -3460,8 +3460,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
}
return false;
}
- final long ident = Binder.clearCallingIdentity();
final var userData = getUserData(userId);
+ final long ident = Binder.clearCallingIdentity();
try {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.hideSoftInput");
if (DEBUG) Slog.v(TAG, "Client requesting input be hidden");