From 870e7946cce18a8c86388f44882e2c0177fe938e Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Mon, 10 Jul 2017 14:43:12 -0700
Subject: 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
---
 src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java | 1 +
 1 file changed, 1 insertion(+)

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;
                 }
             }
         }
-- 
cgit v1.2.3