commit ec252cbd88fd6eceb410bc8845752ce9757b6852
author Cosmin Băieș <cosminbaies@google.com> Thu Aug 22 19:51:50 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 22 19:51:50 2024 +0000
tree 3f84fe008962fa82970cf2938f1d279e5dbab789
parent 9ed5d65d19e97130adab0a4028e41a77015ec949
parent c72eee7db2341866be6e53cd7126876daaf525ac

Merge "Unbind current IME immediately after switching" 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 f34b4e9..7ce9ee6 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -3037,6 +3037,7 @@
                 intent.putExtra("input_method_id", id);
                 mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
             }
+            bindingController.unbindCurrentMethod();
             unbindCurrentClientLocked(UnbindReason.SWITCH_IME, userId);
         } finally {
             Binder.restoreCallingIdentity(ident);