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

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

Merge "Fix 6804479: "Emergency calls only" in notification shade" into jb-dev

parents 2daf9dc9 0ae29275

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

+4 −2
Original line number Diff line number Diff line
@@ -932,10 +932,12 @@ public class NetworkController extends BroadcastReceiver { 


            if (mDataConnected) {

                mobileLabel = mNetworkName;

            } else if (mConnected) {

                if (hasService()) {

            } else if (mConnected || mServiceState.isEmergencyOnly()) {

                if (hasService() || mServiceState.isEmergencyOnly()) {

                    // The isEmergencyOnly test covers the case of a phone with no SIM

                    mobileLabel = mNetworkName;

                } else {

                    // Tablets, basically

                    mobileLabel = "";

                }

            } else {