commit c3ccad16cbdded2ba13f1cae0c326e7c91a73451
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jul 24 10:11:33 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 24 10:11:33 2024 +0000
tree 0aacc5bcc311e8d467b07d0acdfef02b311cb216
parent 24dcb185cfea63ed8317354c26376b9c1ccfd6fc
parent 572334b67688c122b5a6c852e5b8e73143efb8aa

Merge "Unify IMMS#onSecureSettingsChangedLocked() behaviors among 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 288737f..64b6dbe 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -570,13 +570,12 @@
 
     @GuardedBy("ImfLock.class")
     private void onSecureSettingsChangedLocked(@NonNull String key, @UserIdInt int userId) {
-        if (!mConcurrentMultiUserModeEnabled && userId != mCurrentUserId) {
-            return;
-        }
         switch (key) {
             case Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD: {
                 if (!Flags.imeSwitcherRevamp()) {
-                    mMenuController.updateKeyboardFromSettingsLocked();
+                    if (userId == mCurrentUserId) {
+                        mMenuController.updateKeyboardFromSettingsLocked();
+                    }
                 }
                 break;
             }