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

Commit 49accefb authored by Jason Monk's avatar Jason Monk
Browse files

resolve merge conflicts of afeefb63 to master. 

Change-Id: I754a8439f77e4f9e2f636c5b7a04280a01721c95
parents 8d2e8e2b afeefb63

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+5 −0
Original line number Diff line number Diff line
@@ -184,6 +184,11 @@ public class CellularTile extends QSTile<QSTile.SignalState> { 
                // Make sure signal gets cleared out when no sims.

                mInfo.mobileSignalIconId = 0;

                mInfo.dataTypeIconId = 0;

                // Show a No SIMs description to avoid emergency calls message.

                mInfo.enabled = true;

                mInfo.enabledDesc = mContext.getString(

                        R.string.keyguard_missing_sim_message_short);

                mInfo.signalContentDescription = mInfo.enabledDesc;

            }

            refreshState(mInfo);

        }

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ public class MobileSignalController extends SignalController< 
            int length = mSignalsChangedCallbacks.size();

            for (int i = 0; i < length; i++) {

                mSignalsChangedCallbacks.get(i).onMobileDataSignalChanged(mCurrentState.enabled

                        && !mCurrentState.isEmergency && !mCurrentState.airplaneMode,

                        && !mCurrentState.isEmergency,

                        getQsCurrentIconId(), contentDescription,

                        qsTypeIcon,

                        mCurrentState.dataConnected && mCurrentState.activityIn,