diff options
| author | satok <satok@google.com> | 2011-01-06 02:40:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-06 02:40:07 -0800 |
| commit | 82652574b7e68909fd55cca01826fbc0d0c2d173 (patch) | |
| tree | ceb754a817d8d69ccb41f37b44bf383536835d23 /packages | |
| parent | f1304572aeb673f6ebf33c3b723aff74ab4b366e (diff) | |
| parent | 4fdf1de47f945dbead411e9f7232cf714db35e9d (diff) | |
| download | frameworks_base-82652574b7e68909fd55cca01826fbc0d0c2d173.zip frameworks_base-82652574b7e68909fd55cca01826fbc0d0c2d173.tar.gz frameworks_base-82652574b7e68909fd55cca01826fbc0d0c2d173.tar.bz2 | |
Merge "Check null pointer agressively."
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java | 13 |
1 files changed, 7 insertions, 6 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 f5e677d..df4bfa1 100644 --- 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); } } |