diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-07 17:54:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-07 17:54:17 -0700 |
| commit | 75790812975bf26a62779342ffc0939ac76f1358 (patch) | |
| tree | e05c485cae644a1aca0d4b072a30da23970ceaf6 | |
| parent | 376d9b87af12b6d1f42eafa20b03baf7216b06cf (diff) | |
| parent | 31ced5c140cae9b3ad90066a540346acd821a3c9 (diff) | |
| download | frameworks_base-75790812975bf26a62779342ffc0939ac76f1358.zip frameworks_base-75790812975bf26a62779342ffc0939ac76f1358.tar.gz frameworks_base-75790812975bf26a62779342ffc0939ac76f1358.tar.bz2 | |
am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
* commit '31ced5c140cae9b3ad90066a540346acd821a3c9':
Fix NPE in the statusbar.
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 70a78df..3175a99 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -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="); |