am 302e5b3c: am 099b4dc6: Merge "Avoid disk writes on UI thread." into honeycomb

* commit '302e5b3cfd2283dabcab68d34f3709e044f522e6':
  Avoid disk writes on UI thread.

1 files changed, 9 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 7a1ac2e27..c1e14ad18 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -288,11 +288,18 @@ public class SubtypeSwitcher {
     ////////////////////////////
 
     public void switchToShortcutIME() {
-        IBinder token = mService.getWindow().getWindow().getAttributes().token;
+        final IBinder token = mService.getWindow().getWindow().getAttributes().token;
         if (token == null || mShortcutInfo == null) {
             return;
         }
-        mImm.setInputMethodAndSubtype(token, mShortcutInfo.getId(), mShortcutSubtype);
+        final String imiId = mShortcutInfo.getId();
+        final InputMethodSubtype subtype = mShortcutSubtype;
+        new Thread("SwitchToShortcutIME") {
+            @Override
+            public void run() {
+                mImm.setInputMethodAndSubtype(token, imiId, subtype);
+            }
+        }.start();
     }
 
     public Drawable getShortcutIcon() {