diff options
| author | Jack Yu <jackyu@google.com> | 2017-07-11 18:20:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-11 18:20:25 +0000 |
| commit | ca9285dbf14a87bf1a5915f1b5890dc203188f9b (patch) | |
| tree | bf0cec85c327e8731bf9b03ec1f4bfdea7c5060f | |
| parent | 304bd790db943246e33796ba73376ba3e1090c32 (diff) | |
| parent | c44ba22c9c48b8ab2af969a684a595cf28bbefae (diff) | |
| download | CellBroadcastReceiver-ca9285dbf14a87bf1a5915f1b5890dc203188f9b.tar.gz | |
Merge "Added extra message enabled check when receiving alerts" am: dea5466530
am: c44ba22c9c
Change-Id: Ice377ce621725265e46b3737ed8102fc5a8b6dc2
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java index 97cba12a5..a4083f7ba 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java @@ -416,6 +416,7 @@ public class CellBroadcastAlertService extends Service { if (isRoaming(message.getSubId())) { return false; } + return emergencyAlertEnabled; } } } |