diff options
author | satok <satok@google.com> | 2011-01-06 19:30:54 +0900 |
---|---|---|
committer | satok <satok@google.com> | 2011-01-06 19:35:12 +0900 |
commit | 4fdf1de47f945dbead411e9f7232cf714db35e9d (patch) | |
tree | b9b50647a956e6d59ff0d522f973f0a7c3c1f6e0 /packages | |
parent | a01ac783c23070e07a260b90723d2ffe2a0ab224 (diff) | |
download | frameworks_base-4fdf1de47f945dbead411e9f7232cf714db35e9d.zip frameworks_base-4fdf1de47f945dbead411e9f7232cf714db35e9d.tar.gz frameworks_base-4fdf1de47f945dbead411e9f7232cf714db35e9d.tar.bz2 |
Check null pointer agressively.
Bug: 3250622
Change-Id: I25f367ad1bd6a741282603f2f587f7a1256ef460
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); } } |