1 files changed, 6 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
index 7e03e2a..5f14f74 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
@@ -175,10 +175,12 @@ public class InputMethodButton extends ImageView {
                 icon = getShortcutInputMethodAndSubtypeDrawable();
                 break;
         }
-        if (icon == null) {
-            mIcon.setImageResource(R.drawable.ic_sysbar_ime_default);
-        } else {
-            mIcon.setImageDrawable(icon);
+        if (mIcon != null) {
+            if (icon == null) {
+                mIcon.setImageResource(R.drawable.ic_sysbar_ime_default);
+            } else {
+                mIcon.setImageDrawable(icon);
+            }
         }
     }