Merge "Check null pointer agressively."

2011-01-06 02:40:07 -08:00
parent f1304572ae 4fdf1de47f
commit 82652574b7
1 changed files with 7 additions and 6 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
@@ -184,6 +184,9 @@ public class InputMethodButton extends ImageView {
    }

    private void refreshStatusIcon() {
+        if (mIcon == null) {
+            return;
+        }
        if (!needsToShowIMEButton()) {
            setVisibility(View.INVISIBLE);
            return;
@@ -202,12 +205,10 @@ public class InputMethodButton extends ImageView {
                icon = getShortcutInputMethodAndSubtypeDrawable();
                break;
        }
-        if (mIcon != null) {
-            if (icon == null) {
-                mIcon.setImageResource(R.drawable.ic_sysbar_ime_default);
-            } else {
-                mIcon.setImageDrawable(icon);
-            }
+        if (icon == null) {
+            mIcon.setImageResource(R.drawable.ic_sysbar_ime_default);
+        } else {
+            mIcon.setImageDrawable(icon);
        }
    }