commit 7da1ad699989db8417ce54eb26697eae4a30f634
author Daniel Sandler <dsandler@android.com> Wed Jul 25 11:34:52 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 25 11:34:52 2012 -0700
tree 9e0ad5aeb0e7aab1ff4f4eb18cb8f6c4833340b3
parent 71930dd77e4dc6f6be5c648019d2ab0da5f0584c
parent c524ca275add1c84ef4e1e5c105058f44cac5efb

am c524ca27: Merge "Fix NPE on some phones at startup." into jb-dev

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

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

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 {