commit bada87431a6d9f43547b363be240f5df2358c43c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 09 03:02:14 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 03:02:14 2024 +0000
tree 69b92b3654bdda4dacd09fa5cdc419e0d7c8f366
parent a85d5c8d6e3007479ea8a08275cda480bca86c04
parent 14bea36314d501f44909b58e910e9dcec898b839

Merge "Simplify IMMS#startInputUncheckedLocked a bit" into main

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 1b9d6c5..0fde760 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -2234,7 +2234,7 @@
             mInputManagerInternal.notifyInputMethodConnectionActive(connectionIsActive);
         }
         final var userData = mUserDataRepository.getOrCreate(mCurrentUserId);
-
+        final var bindingController = userData.mBindingController;
 
         // If configured, we want to avoid starting up the IME if it is not supposed to be showing
         if (shouldPreventImeStartupLocked(selectedMethodId, startInputFlags,
@@ -2243,7 +2243,7 @@
                 Slog.d(TAG, "Avoiding IME startup and unbinding current input method.");
             }
             invalidateAutofillSessionLocked();
-            userData.mBindingController.unbindCurrentMethod();
+            bindingController.unbindCurrentMethod();
             return InputBindResult.NO_EDITOR;
         }
 
@@ -2275,8 +2275,8 @@
             }
         }
 
-        userData.mBindingController.unbindCurrentMethod();
-        return userData.mBindingController.bindCurrentMethod();
+        bindingController.unbindCurrentMethod();
+        return bindingController.bindCurrentMethod();
     }
 
     /**