From aca0c757e6ea1e369807701083271546d851cdfb Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Mon, 1 Oct 2012 12:59:36 -0400 Subject: [PATCH] Fix IME tile related crash Bug: 7246375 Change-Id: I374ed201ea4870fb7397d075baed09524061030d --- .../systemui/statusbar/phone/QuickSettingsModel.java | 6 ++++-- 1 file 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 5adfeb1b6a771..6b9a321081861 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 imis, PackageManager pm) {