diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-07-25 12:31:22 -0400 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-07-26 16:07:43 -0700 |
| commit | 4df2c7fa44a71f351ac9aab5eb9c6909d76e9419 (patch) | |
| tree | fa82f3380a3649b80286b1f92fc5b5894ae677e1 | |
| parent | 7728854613b8191ba3cbde44e01ad89ece0dc5b6 (diff) | |
| download | base-4df2c7fa44a71f351ac9aab5eb9c6909d76e9419.tar.gz | |
Fix NPE on some phones at startup.
Bug: 6877589
Change-Id: I65ff37b4cf6b59a72a7aa665f252f5fb34f3b183
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 5 |
1 files changed, 3 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 230114ad341a..e3f2ca4e63f2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -917,6 +917,7 @@ public class NetworkController extends BroadcastReceiver { String wifiLabel = ""; String mobileLabel = ""; int N; + final boolean emergencyOnly = (mServiceState != null && mServiceState.isEmergencyOnly()); if (!mHasMobileDataFeature) { mDataSignalIconId = mPhoneSignalIconId = 0; @@ -932,8 +933,8 @@ public class NetworkController extends BroadcastReceiver { if (mDataConnected) { mobileLabel = mNetworkName; - } else if (mConnected || mServiceState.isEmergencyOnly()) { - if (hasService() || mServiceState.isEmergencyOnly()) { + } else if (mConnected || emergencyOnly) { + if (hasService() || emergencyOnly) { // The isEmergencyOnly test covers the case of a phone with no SIM mobileLabel = mNetworkName; } else { |