am 7da1ad69: am c524ca27: Merge "Fix NPE on some phones at startup." into jb-dev
* commit '7da1ad699989db8417ce54eb26697eae4a30f634':
Fix NPE on some phones at startup.
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 4fc6940..9035e45 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -920,6 +920,7 @@
String wifiLabel = "";
String mobileLabel = "";
int N;
+ final boolean emergencyOnly = (mServiceState != null && mServiceState.isEmergencyOnly());
if (!mHasMobileDataFeature) {
mDataSignalIconId = mPhoneSignalIconId = 0;
@@ -935,8 +936,8 @@
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 {