diff options
| author | Joe Onorato <joeo@google.com> | 2010-11-15 15:35:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-15 15:35:58 -0800 |
| commit | 45c7af972566db6ea3e028f1d6508c1f24b445d6 (patch) | |
| tree | 70ba0489401a87d20f83cfbffde058d31fc6e279 /packages | |
| parent | 7dcf95af0572cefcb00341265bb9c3a8b833f82e (diff) | |
| parent | 801ade0f08364042a530c9f0530094c2bcc020f8 (diff) | |
| download | frameworks_base-45c7af972566db6ea3e028f1d6508c1f24b445d6.zip frameworks_base-45c7af972566db6ea3e028f1d6508c1f24b445d6.tar.gz frameworks_base-45c7af972566db6ea3e028f1d6508c1f24b445d6.tar.bz2 | |
Merge "Don't crash if we haven't gotten a signal strength yet."
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 4 |
1 files changed, 3 insertions, 1 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 f1b76f6..04f7195 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -321,7 +321,9 @@ public class NetworkController extends BroadcastReceiver { mPhoneSignalIconId = R.drawable.stat_sys_signal_null; } } else { - if (isCdma()) { + if (mSignalStrength == null) { + mPhoneSignalIconId = R.drawable.stat_sys_signal_null; + } else if (isCdma()) { // If 3G(EV) and 1x network are available than 3G should be // displayed, displayed RSSI should be from the EV side. // If a voice call is made then RSSI should switch to 1x. |