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

Commit afeefb63 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 

automerge: 3454612e

* commit '3454612e':
  Avoid showing emergency calls when not possible
parents f428db20 3454612e

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/NetworkControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                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,