summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2017-07-11 16:59:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-11 16:59:28 +0000
commita4e0fe3acade714a561c24bd822ccec0ff1d3de4 (patch)
tree06dcc0d7116689578bf8e76ff21522810e2bf97a
parent65a4bfa82e73a21d07e23de47007e64983a3eee1 (diff)
parent8f74982db8abb5c3e6e548a9cec0f2424bc129de (diff)
downloadCellBroadcastReceiver-a4e0fe3acade714a561c24bd822ccec0ff1d3de4.tar.gz
Merge "Added extra message enabled check when receiving alerts"
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 5e4864c0f..17c7c956e 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -442,6 +442,8 @@ public class CellBroadcastAlertService extends Service {
}
return false;
}
+
+ return emergencyAlertEnabled;
}
}
}