am 08b7e78: am 7da1ad6: am c524ca2: Merge "Fix NPE on some phones at startup." into jb-dev

* commit '08b7e78597b06b3801d909c9e9ca1538ed9fc355':
  Fix NPE on some phones at startup.

Author: dsandler

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

@@ -920,6 +920,7 @@ void refreshViews() {
         String wifiLabel = "";
         String mobileLabel = "";
         int N;
+        final boolean emergencyOnly = (mServiceState != null && mServiceState.isEmergencyOnly());
 
         if (!mHasMobileDataFeature) {
             mDataSignalIconId = mPhoneSignalIconId = 0;
@@ -935,8 +936,8 @@ void refreshViews() {
 
             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 {