From 49a8bbf4eacbf0bde71bab05be0ab40488df109c Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Thu, 23 Sep 2010 09:50:04 -0700 Subject: 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 --- .../SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java index 0fc092ef9a09..0309430a02b1 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) { -- cgit v1.2.3-59-g8ed1b