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

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

Browse Source 
* commit '7da1ad699989db8417ce54eb26697eae4a30f634':
  Fix NPE on some phones at startup.
This commit is contained in:
Daniel Sandler
2012-07-25 15:05:35 -07:00
committed by Android Git Automerger
parent ddd88726a2 7da1ad6999
commit 08b7e78597
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

@@ -920,6 +920,7 @@ public class NetworkController extends BroadcastReceiver {
String wifiLabel = ""; String wifiLabel = "";
String mobileLabel = ""; String mobileLabel = "";
int N; int N;
final boolean emergencyOnly = (mServiceState != null && mServiceState.isEmergencyOnly());
if (!mHasMobileDataFeature) { if (!mHasMobileDataFeature) {
mDataSignalIconId = mPhoneSignalIconId = 0; mDataSignalIconId = mPhoneSignalIconId = 0;
@@ -935,8 +936,8 @@ public class NetworkController extends BroadcastReceiver {
if (mDataConnected) { if (mDataConnected) {
mobileLabel = mNetworkName; mobileLabel = mNetworkName;
} else if (mConnected || mServiceState.isEmergencyOnly()) { } else if (mConnected || emergencyOnly) {
if (hasService() || mServiceState.isEmergencyOnly()) { if (hasService() || emergencyOnly) {
// The isEmergencyOnly test covers the case of a phone with no SIM // The isEmergencyOnly test covers the case of a phone with no SIM
mobileLabel = mNetworkName; mobileLabel = mNetworkName;
} else { } else {