commit 7fee71f66afef6421b92fa48e63d4bc73f5d0c27
author satok <satok@google.com> Fri Dec 17 18:54:26 2010 +0900
committer satok <satok@google.com> Fri Dec 17 19:00:44 2010 +0900
tree 3b21b203862606a78d6cbeb033c2bd0eb66ae723
parent f7ca8f0e4f143e63ddcd892e344f4c71cca92af8

Fix build breakage

Change-Id: I5db5bcafc61f0aea5279e2f8679094a900b6f6cc

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

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 21c9f7d..9c56a2a 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1321,7 +1321,8 @@
                 || mCurClient.client.asBinder() != client.asBinder()) {
                 Slog.w(TAG, "Ignoring showInputMethodAndSubtypeEnablerFromClient of: " + client);
             }
-            mHandler.sendEmptyMessage(MSG_SHOW_IM_SUBTYPE_ENABLER, inputMethodId);
+            executeOrSendMessage(mCurMethod, mCaller.obtainMessageO(
+                    MSG_SHOW_IM_SUBTYPE_ENABLER, inputMethodId));
         }
     }
 
@@ -1430,10 +1431,7 @@
 
             case MSG_SHOW_IM_SUBTYPE_ENABLER:
                 args = (HandlerCaller.SomeArgs)msg.obj;
-                try {
-                    showInputMethodAndSubtypeEnabler((String)args.arg1);
-                } catch (RemoteException e) {
-                }
+                showInputMethodAndSubtypeEnabler((String)args.arg1);
                 return true;
 
             case MSG_SHOW_IM_CONFIG:
@@ -1638,7 +1636,9 @@
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                 | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
                 | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.putExtra(EXTRA_INPUT_METHOD_ID, inputMethodId);
+        if (!TextUtils.isEmpty(inputMethodId)) {
+            intent.putExtra(EXTRA_INPUT_METHOD_ID, inputMethodId);
+        }
         mContext.startActivity(intent);
     }