diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-23 10:50:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 10:50:54 -0700 |
| commit | 7461c9e3443d52efed315273bbb348798b16f604 (patch) | |
| tree | abe1d4e21c214b22e1d0fe3bce7243f7e52cdc89 /packages/SystemUI | |
| parent | 3611a0ef0653105d6f28996786ed7f2ce1f3f91f (diff) | |
| parent | 999d483bf8fc4271c42484aaf253f12e4eb8ff29 (diff) | |
| download | frameworks_base-7461c9e3443d52efed315273bbb348798b16f604.zip frameworks_base-7461c9e3443d52efed315273bbb348798b16f604.tar.gz frameworks_base-7461c9e3443d52efed315273bbb348798b16f604.tar.bz2 | |
am 999d483b: am 49a8bbf4: Don\'t crash if we\'ve never gotten a signal strength update.
Merge commit '999d483bf8fc4271c42484aaf253f12e4eb8ff29'
* commit '999d483bf8fc4271c42484aaf253f12e4eb8ff29':
Don't crash if we've never gotten a signal strength update.
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java index 0fc092e..0309430 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java @@ -844,7 +844,7 @@ public class StatusBarPolicy { int[] iconList; // Display signal strength while in "emergency calls only" mode - if (!hasService() && !mServiceState.isEmergencyOnly()) { + if (mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly())) { //Slog.d(TAG, "updateSignalStrength: no service"); if (Settings.System.getInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) == 1) { |