Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Sandler
2012-07-25 11:32:38 -07:00
committed by Android (Google) Code Review
parent a45746efad 9af376e57a
commit c524ca275a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -917,6 +917,7 @@ public class NetworkController extends BroadcastReceiver {
String wifiLabel = "";
String mobileLabel = "";
int N;
final boolean emergencyOnly = (mServiceState != null && mServiceState.isEmergencyOnly());
if (!mHasMobileDataFeature) {
mDataSignalIconId = mPhoneSignalIconId = 0;
@@ -932,8 +933,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 {