Skip to content

Commit 7728854

Browse files
dsandlerThe Android Automerger
authored andcommitted
Fix 6804479: "Emergency calls only" in notification shade
Add an additional codepath to the "no connectivity" logic in NetworkController to allow the PLMN bubble up from the GsmServiceStateTracker, where R.string.emergency_calls_only is returned if we're in emergency call mode. Bug: 6804479 Change-Id: I0a77261e4393cc0dc32bae3e631ef196b2342f06
1 parent 08063c9 commit 7728854

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,10 +932,12 @@ void refreshViews() {
932932

933933
if (mDataConnected) {
934934
mobileLabel = mNetworkName;
935-
} else if (mConnected) {
936-
if (hasService()) {
935+
} else if (mConnected || mServiceState.isEmergencyOnly()) {
936+
if (hasService() || mServiceState.isEmergencyOnly()) {
937+
// The isEmergencyOnly test covers the case of a phone with no SIM
937938
mobileLabel = mNetworkName;
938939
} else {
940+
// Tablets, basically
939941
mobileLabel = "";
940942
}
941943
} else {

0 commit comments

Comments
 (0)