diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index a6a3e270efd95..34113cf40e138 100644 --- 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 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; }