summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2012-10-01 10:00:40 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-10-01 10:00:40 -0700
commitbfbf6e1232013a999f4776f7fdf7cf6fb577f89b (patch)
tree7c7c85bab05794734c181ed484d82ac7db28c989
parentff70848eb2a6b916ad2ad2ceec0c59bcb41373a2 (diff)
parentaca0c757e6ea1e369807701083271546d851cdfb (diff)
Merge "Fix IME tile related crash" into jb-mr1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
index 5adfeb1b6a77..6b9a32108186 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -184,7 +184,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
private State mLocationState = new State();
private QuickSettingsTileView mImeTile;
- private RefreshCallback mImeCallback;
+ private RefreshCallback mImeCallback = null;
private State mImeState = new State();
private QuickSettingsTileView mRotationLockTile;
@@ -551,7 +551,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
mImeState.enabled = (visible && needsToShowImeSwitchOngoingNotification(imm));
mImeState.label = getCurrentInputMethodName(mContext, mContext.getContentResolver(),
imm, imis, mContext.getPackageManager());
- mImeCallback.refreshView(mImeTile, mImeState);
+ if (mImeCallback != null) {
+ mImeCallback.refreshView(mImeTile, mImeState);
+ }
}
private static String getCurrentInputMethodName(Context context, ContentResolver resolver,
InputMethodManager imm, List<InputMethodInfo> imis, PackageManager pm) {