diff options
| author | 2010-09-23 10:45:40 -0700 | |
|---|---|---|
| committer | 2010-09-23 10:45:40 -0700 | |
| commit | 999d483bf8fc4271c42484aaf253f12e4eb8ff29 (patch) | |
| tree | d1ba560b0c2358733a97e205f6580a087e4ad97a | |
| parent | 693a430cff3c9fac503b5005e9fd5419611eddde (diff) | |
| parent | 49a8bbf4eacbf0bde71bab05be0ab40488df109c (diff) | |
am 49a8bbf4: Don\'t crash if we\'ve never gotten a signal strength update.
Merge commit '49a8bbf4eacbf0bde71bab05be0ab40488df109c' into gingerbread-plus-aosp
* commit '49a8bbf4eacbf0bde71bab05be0ab40488df109c':
Don't crash if we've never gotten a signal strength update.
| -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 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) { |