commit 8b70c9c1db121d38c9664af77a8aa830820b4983
author Yuncheol Heo <ycheo@google.com> Wed May 12 13:35:55 2010 +0900
committer Yuncheol Heo <ycheo@google.com> Thu May 13 09:45:27 2010 +0900
tree ae49669339abdeca4612041d9f10a6cd10e5ce33
parent d4a2fffefdd27450ce7ef3867d2a2aaf87315969

Pick the default IME in case of a fresh install.

Bug: 2661261

Change-Id: Id8077ffddd8ddc5c3d3fd371afaad63698ef8d9e

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 5bf66e4..90c456c 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -472,8 +472,10 @@
                 mContext.getContentResolver(),
                 Settings.Secure.ENABLED_INPUT_METHODS);
         Slog.i(TAG, "Enabled input methods: " + enabledStr);
-        if (enabledStr == null) {
-            Slog.i(TAG, "Enabled input methods has not been set, enabling all");
+        final String defaultIme = Settings.Secure.getString(mContext
+                .getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
+        if (enabledStr == null || TextUtils.isEmpty(defaultIme)) {
+            Slog.i(TAG, "Enabled input methods or default IME has not been set, enabling all");
             InputMethodInfo defIm = null;
             StringBuilder sb = new StringBuilder(256);
             final int N = mMethodList.size();
@@ -1483,7 +1485,7 @@
 
         String defaultIme = Settings.Secure.getString(mContext
                 .getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
-        if (!map.containsKey(defaultIme)) {
+        if (!TextUtils.isEmpty(defaultIme) && !map.containsKey(defaultIme)) {
             if (chooseNewDefaultIMELocked()) {
                 updateFromSettingsLocked();
             }