diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2010-10-15 19:31:21 +0100 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-10-16 23:44:59 -0400 |
| commit | c5efffd3ea508745ceba287e1444e69b36b7d6e9 (patch) | |
| tree | 7f5ab2070ca7468841857633d00e885de128202d | |
| parent | c3a024d25ed4ca5ad73adc3b47836f7edaeac3eb (diff) | |
| download | frameworks_base-c5efffd3ea508745ceba287e1444e69b36b7d6e9.zip frameworks_base-c5efffd3ea508745ceba287e1444e69b36b7d6e9.tar.gz frameworks_base-c5efffd3ea508745ceba287e1444e69b36b7d6e9.tar.bz2 | |
StatusBarPolicy: Fix system_server crashes when radio isn't initialized
If the radio is still initializing when we reach the lockscreen, there is no service state object, but we were attempting to read it anyway to see if emergency mode applied (resulting in a system_server crash). This fixes it.
Change-Id: I71d52b033a162cdb0604af8e00c50ec1740f8302
| -rw-r--r-- | services/java/com/android/server/status/StatusBarPolicy.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java index 9b93530..da7f2f3 100644 --- a/services/java/com/android/server/status/StatusBarPolicy.java +++ b/services/java/com/android/server/status/StatusBarPolicy.java @@ -1045,7 +1045,8 @@ public class StatusBarPolicy { int[] iconList; // Display signal strength while in "emergency calls only" mode - if (!hasService() && !mServiceState.isEmergencyOnly()) { + if (!hasService() && mServiceState != null + && !mServiceState.isEmergencyOnly()) { //Slog.d(TAG, "updateSignalStrength: no service"); if (Settings.System.getInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) == 1) { |