Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fbfd263 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

* commit '08b7e785':
  Fix NPE on some phones at startup.
parents 440f32bb 08b7e785

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

+3 −2
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ public class NetworkController extends BroadcastReceiver { 
        String wifiLabel = "";

        String mobileLabel = "";

        int N;

        final boolean emergencyOnly = (mServiceState != null && mServiceState.isEmergencyOnly());



        if (!mHasMobileDataFeature) {

            mDataSignalIconId = mPhoneSignalIconId = 0;
@@ -935,8 +936,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 {