Merge "Fix null pointer exception"

2010-12-05 21:38:30 -08:00
parent f9adf6b74f bd81c3fe34
commit a6738744db
1 changed files with 6 additions and 4 deletions
--- 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);
+            }
        }
    }