Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Sandler
2012-07-24 20:30:24 -07:00
committed by Android (Google) Code Review
parent 2daf9dc9eb 0ae29275b8
commit 3ee47ae7ee
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -932,10 +932,12 @@ public class NetworkController extends BroadcastReceiver {
if (mDataConnected) { if (mDataConnected) {
mobileLabel = mNetworkName; mobileLabel = mNetworkName;
} else if (mConnected) { } else if (mConnected || mServiceState.isEmergencyOnly()) {
if (hasService()) { if (hasService() || mServiceState.isEmergencyOnly()) {
// The isEmergencyOnly test covers the case of a phone with no SIM
mobileLabel = mNetworkName; mobileLabel = mNetworkName;
} else { } else {
// Tablets, basically
mobileLabel = ""; mobileLabel = "";
} }
} else { } else {