diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-07-24 15:19:04 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2012-07-24 20:41:31 -0400 |
| commit | 0ae29275b863b865c7734f14a4427906134b95b1 (patch) | |
| tree | 2ffaef7500c6fbd8f69be61eaea9c6fd01e4f49a /packages | |
| parent | 156671ef9a6581b6790bb17bfda8a9efcf9f0693 (diff) | |
| download | frameworks_base-0ae29275b863b865c7734f14a4427906134b95b1.zip frameworks_base-0ae29275b863b865c7734f14a4427906134b95b1.tar.gz frameworks_base-0ae29275b863b865c7734f14a4427906134b95b1.tar.bz2 | |
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
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 1068267..230114a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -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 { |