summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/status/StatusBarPolicy.java
diff options
context:
space:
mode:
Diffstat (limited to 'services/java/com/android/server/status/StatusBarPolicy.java')
-rw-r--r--services/java/com/android/server/status/StatusBarPolicy.java3
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) {