Fix issue #2325621 Runtime restart after launching Android keyboard setting .

2010-03-03 00:08:31 -08:00
parent ddb42a421f
commit 97106ab5af
1 changed files with 10 additions and 1 deletions
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1475,13 +1475,22 @@ public class InputMethodManagerService extends IInputMethodManager.Stub

        final List<InputMethodInfo> immis = getEnabledInputMethodList();

-        int N = (immis == null ? 0 : immis.size());
+        if (immis == null) {
+            return;
+        }
+        
+        int N = immis.size();

        mItems = new CharSequence[N];
        mIms = new InputMethodInfo[N];

        for (int i = 0; i < N; ++i) {
            InputMethodInfo property = immis.get(i);
+            if (property == null) {
+                i--;
+                N--;
+                continue;
+            }
            mItems[i] = property.loadLabel(pm);
            mIms[i] = property;
        }