diff options
| author | satok <satok@google.com> | 2011-01-16 23:48:24 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-16 23:48:24 -0800 |
| commit | 5a1473bae0467693445b31454e4f736763276de8 (patch) | |
| tree | cdd6a75096580fd97f9190a779dde697ddbdb626 /packages | |
| parent | 92cd4d0296cc8936fcccd97cdbc7a13b724efab4 (diff) | |
| parent | f6cafb63753a26440cb3ad2e5124370aef650015 (diff) | |
| download | frameworks_base-5a1473bae0467693445b31454e4f736763276de8.zip frameworks_base-5a1473bae0467693445b31454e4f736763276de8.tar.gz frameworks_base-5a1473bae0467693445b31454e4f736763276de8.tar.bz2 | |
Merge "Implicitly/Explicitly subtypes bug." into honeycomb
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java index d4ba693..add67b1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java @@ -242,6 +242,7 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, O // Turn on the selected radio button at startup private void updateRadioButtonsByImiAndSubtype( InputMethodInfo imi, InputMethodSubtype subtype) { + if (imi == null) return; if (DEBUG) { Log.d(TAG, "Update radio buttons by " + imi.getId() + ", " + subtype); } @@ -253,7 +254,7 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, O return; } Pair<InputMethodInfo, InputMethodSubtype> imiAndSubtype = - mRadioViewAndImiMap.get(radioView); + mRadioViewAndImiMap.get(radioView); if (imiAndSubtype.first.getId().equals(imi.getId()) && (imiAndSubtype.second == null || imiAndSubtype.second.equals(subtype))) { subtypeRadioButton.setChecked(true); |