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

am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE

Browse Source 
* commit '350b78291de725a1607395055b6d28655d9e1080':
  Fix NPE in the statusbar.
This commit is contained in:
Robert Greenwalt
2011-06-07 11:01:23 -07:00
committed by Android Git Automerger
parent 6aa152a1df 350b78291d
commit 31ced5c140
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,12 +446,14 @@ public class NetworkController extends BroadcastReceiver {
}
boolean isCdmaEri() {
final int iconIndex = mServiceState.getCdmaEriIconIndex();
if (iconIndex != EriInfo.ROAMING_INDICATOR_OFF) {
final int iconMode = mServiceState.getCdmaEriIconMode();
if (iconMode == EriInfo.ROAMING_ICON_MODE_NORMAL
|| iconMode == EriInfo.ROAMING_ICON_MODE_FLASH) {
return true;
if (mServiceState != null) {
final int iconIndex = mServiceState.getCdmaEriIconIndex();
if (iconIndex != EriInfo.ROAMING_INDICATOR_OFF) {
final int iconMode = mServiceState.getCdmaEriIconMode();
if (iconMode == EriInfo.ROAMING_ICON_MODE_NORMAL
|| iconMode == EriInfo.ROAMING_ICON_MODE_FLASH) {
return true;
}
}
}
return false;
@@ -854,7 +856,7 @@ public class NetworkController extends BroadcastReceiver {
pw.print(" mDataActivity=");
pw.println(mDataActivity);
pw.print(" mServiceState=");
pw.println(mServiceState.toString());
pw.println(mServiceState);
pw.print(" mNetworkName=");
pw.println(mNetworkName);
pw.print(" mNetworkNameDefault=");