commit f68c80b4e9dbdb1e5bf6620f437c3d9f865eb047
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 01 20:28:38 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 01 20:28:38 2024 +0000
tree ff14c8f3bbbaace1684d7336d1a276b24abaf2f0
parent 7e53507495790dead2662247cce66dfd6e1ea8a0
parent 2a6b6848a7530d294e2753942364a755917a7799

Merge "Revert "Temporarily make binding controller no-op for visible bg users"" 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 f5e13d5..78d501c 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -2929,6 +2929,9 @@
         final var userData = getUserData(userId);
         userData.mSwitchingController.resetCircularListLocked(mContext, settings);
         userData.mHardwareKeyboardShortcutController.update(settings);
+
+        final var bindingController = getInputMethodBindingController(userId);
+        bindingController.setSelectedMethodId(id);
     }
 
     @GuardedBy("ImfLock.class")