diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-06 15:28:45 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-06 17:16:45 -0700 |
| commit | acab04dfc16f0ad08ecd167ae759c158cea2e19f (patch) | |
| tree | 5026b06bfe2a3abe1f5e5978774ae1737656d465 /packages | |
| parent | e9d32283e4eca1ee27218ed66f754a694678ac6d (diff) | |
| download | frameworks_base-acab04dfc16f0ad08ecd167ae759c158cea2e19f.zip frameworks_base-acab04dfc16f0ad08ecd167ae759c158cea2e19f.tar.gz frameworks_base-acab04dfc16f0ad08ecd167ae759c158cea2e19f.tar.bz2 | |
Fix NPE in the statusbar.
Happens for some reason when switching between LTE and CDMA. Filing separate
bug about why we see the null ServiceState in that case, but it revealed
this one use which wasn't checked for null.
bug:4518551
Change-Id: If8f9a89658a7165d79f96cad7d99cbf670e96ae7
Diffstat (limited to 'packages')
| -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="); |