commit e00633e49a7136e14da8ce9938cf6a3333f28498
author Ken Wakasa <kwakasa@google.com> Mon Sep 12 12:01:25 2011 +0900
committer Ken Wakasa <kwakasa@google.com> Mon Sep 12 12:18:09 2011 +0900
tree 51621bda3a0cd6cc2e7f704724f9dc708905f33b
parent f4b783f8a7f7ba56a879b0fce075257659e9f909

Fix NPE

bug: 5290369
Change-Id: Ica450c49fc0bc89b1697eaa1086707f481f6be7e

packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
index e406a0c..f793af9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
@@ -218,8 +218,12 @@
 
     private View createInputMethodItem(
             final InputMethodInfo imi, final InputMethodSubtype subtype) {
-        final CharSequence subtypeName = subtype.overridesImplicitlyEnabledSubtype()
-                ? null : getSubtypeName(imi, subtype);
+        final CharSequence subtypeName;
+        if (subtype == null || subtype.overridesImplicitlyEnabledSubtype()) {
+            subtypeName = null;
+        } else {
+            subtypeName = getSubtypeName(imi, subtype);
+        }
         final CharSequence imiName = getIMIName(imi);
         final Drawable icon = getSubtypeIcon(imi, subtype);
         final View view = View.inflate(mContext, R.layout.status_bar_input_methods_item, null);