Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfbf6e12 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Fix IME tile related crash" into jb-mr1-dev

parents ff70848e aca0c757

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

+4 −2
Original line number Diff line number Diff line
@@ -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,8 +551,10 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, 
        mImeState.enabled = (visible && needsToShowImeSwitchOngoingNotification(imm));

        mImeState.label = getCurrentInputMethodName(mContext, mContext.getContentResolver(),

                imm, imis, mContext.getPackageManager());

        if (mImeCallback != null) {

            mImeCallback.refreshView(mImeTile, mImeState);

        }

    }

    private static String getCurrentInputMethodName(Context context, ContentResolver resolver,

            InputMethodManager imm, List<InputMethodInfo> imis, PackageManager pm) {

        if (resolver == null || imis == null) return null;