summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2017-07-10 14:43:12 -0700
committerJack Yu <jackyu@google.com>2017-07-11 10:07:51 -0700
commit870e7946cce18a8c86388f44882e2c0177fe938e (patch)
treec664f672ae15c44ab3a3429d8c0d62a9163d6558
parentc52467b4e38ab74b233ea132b3212a9d17af0785 (diff)
downloadCellBroadcastReceiver-870e7946cce18a8c86388f44882e2c0177fe938e.tar.gz
Added extra message enabled check when receiving alerts
Though we are not supposed to receive messages that are not enabled, it is still safer to add extra enablement check when receiving the alerts. bug: 62184825 Test: Cell broadcast receiver unit tests Merged-In: I04bd6ebfb5672c39b25c4bcbd36b94e58e8a0ee5 Change-Id: I04bd6ebfb5672c39b25c4bcbd36b94e58e8a0ee5
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 57724146c..7ca797856 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -409,6 +409,7 @@ public class CellBroadcastAlertService extends Service {
if (isRoaming(message.getSubId())) {
return false;
}
+ return emergencyAlertEnabled;
}
}
}