summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-09-23 09:50:04 -0700
committerJoe Onorato <joeo@android.com>2010-09-23 10:31:00 -0700
commit49a8bbf4eacbf0bde71bab05be0ab40488df109c (patch)
tree871611118aa4d227b583e13c456bf1324e8804ce /packages
parent903fc221068d02bdb53ba2a48f86339caf405259 (diff)
downloadframeworks_base-49a8bbf4eacbf0bde71bab05be0ab40488df109c.zip
frameworks_base-49a8bbf4eacbf0bde71bab05be0ab40488df109c.tar.gz
frameworks_base-49a8bbf4eacbf0bde71bab05be0ab40488df109c.tar.bz2
Don't crash if we've never gotten a signal strength update.
It looks like this timing bug has been there forever, and we're just starting to hit it now. Bug: 3027952 Change-Id: I5c14ccd7f74205dc6930f4282cec0e23eeb54cab
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java2
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) {