Skip to content

Commit 4df2c7f

Browse files
dsandlerThe Android Automerger
authored andcommitted
Fix NPE on some phones at startup.
Bug: 6877589 Change-Id: I65ff37b4cf6b59a72a7aa665f252f5fb34f3b183
1 parent 7728854 commit 4df2c7f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,7 @@ void refreshViews() {
917917
String wifiLabel = "";
918918
String mobileLabel = "";
919919
int N;
920+
final boolean emergencyOnly = (mServiceState != null && mServiceState.isEmergencyOnly());
920921

921922
if (!mHasMobileDataFeature) {
922923
mDataSignalIconId = mPhoneSignalIconId = 0;
@@ -932,8 +933,8 @@ void refreshViews() {
932933

933934
if (mDataConnected) {
934935
mobileLabel = mNetworkName;
935-
} else if (mConnected || mServiceState.isEmergencyOnly()) {
936-
if (hasService() || mServiceState.isEmergencyOnly()) {
936+
} else if (mConnected || emergencyOnly) {
937+
if (hasService() || emergencyOnly) {
937938
// The isEmergencyOnly test covers the case of a phone with no SIM
938939
mobileLabel = mNetworkName;
939940
} else {

0 commit comments

Comments
 (0)