Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0cfda91b: am bfbf6e12: Merge "Fix IME tile related crash" into jb-mr1-dev

Browse Source 
* commit '0cfda91b918a22d8f12775568dfaf7de1efc817b':
  Fix IME tile related crash
This commit is contained in:
Daniel Sandler
2012-10-01 10:24:09 -07:00
committed by Android Git Automerger
parent e58fc04f7c 0cfda91b91
commit 3c367cd496
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
View File

@@ -184,7 +184,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
private State mLocationState = new State(); private State mLocationState = new State();
private QuickSettingsTileView mImeTile; private QuickSettingsTileView mImeTile;
private RefreshCallback mImeCallback; private RefreshCallback mImeCallback = null;
private State mImeState = new State(); private State mImeState = new State();
private QuickSettingsTileView mRotationLockTile; private QuickSettingsTileView mRotationLockTile;
@@ -551,7 +551,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
mImeState.enabled = (visible && needsToShowImeSwitchOngoingNotification(imm)); mImeState.enabled = (visible && needsToShowImeSwitchOngoingNotification(imm));
mImeState.label = getCurrentInputMethodName(mContext, mContext.getContentResolver(), mImeState.label = getCurrentInputMethodName(mContext, mContext.getContentResolver(),
imm, imis, mContext.getPackageManager()); imm, imis, mContext.getPackageManager());
mImeCallback.refreshView(mImeTile, mImeState); if (mImeCallback != null) {
mImeCallback.refreshView(mImeTile, mImeState);
}
} }
private static String getCurrentInputMethodName(Context context, ContentResolver resolver, private static String getCurrentInputMethodName(Context context, ContentResolver resolver,
InputMethodManager imm, List<InputMethodInfo> imis, PackageManager pm) { InputMethodManager imm, List<InputMethodInfo> imis, PackageManager pm) {