Snap for 5964166 from e2d5166d6ccd1bbcd444a4a406c7811ab3216867 to qt-qpr1-aml-releaseandroid-mainline-10.0.0_r4android10-qpr1-mainline-release

Change-Id: I2eb27aa92895ff76e3234d8298f7013783e9f9d1

3 files changed, 15 insertions, 0 deletions

diff --git a/res/values-mcc310/config.xml b/res/values-mcc310/config.xml
index d164ad774..80f9b5050 100644
--- a/res/values-mcc310/config.xml
+++ b/res/values-mcc310/config.xml
@@ -73,4 +73,9 @@
         <!-- state/local test additional language -->
         <item>0x112F-0x112F:rat=gsm, emergency=true, filter_language=true</item>
     </string-array>
+    <!-- Channels to receive geo-fencing trigger messages -->
+    <string-array name="geo_fencing_trigger_messages_range_strings" translatable="false">
+        <!-- geo-fencing trigger messages -->
+        <item>0x1130-0x1130:rat=gsm, emergency=true</item>
+    </string-array>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index af5826407..86234472f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -94,6 +94,8 @@
     <string-array name="public_safety_messages_channels_range_strings" translatable="false"></string-array>
     <!-- Channels to receive state/local test messages -->
     <string-array name="state_local_test_alert_range_strings" translatable="false"></string-array>
+    <!-- Channels to receive geo-fencing trigger messages -->
+    <string-array name="geo_fencing_trigger_messages_range_strings" translatable="false"></string-array>
 
     <!-- Values that are retrieved from the ListPreference.
          These must match the alert_reminder_interval_entries list above. -->
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index 196d52934..ec5265737 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -164,6 +164,8 @@ public class CellBroadcastConfigService extends IntentService {
         boolean enableEmergencyAlerts = enableAlertsMasterToggle && prefs.getBoolean(
                 CellBroadcastSettings.KEY_ENABLE_EMERGENCY_ALERTS, true);
 
+        boolean enableGeoFencingTriggerMessage = enableForSub;
+
         if (VDBG) {
             log("enableAlertsMasterToggle = " + enableAlertsMasterToggle);
             log("enableEtwsAlerts = " + enableEtwsAlerts);
@@ -177,6 +179,7 @@ public class CellBroadcastConfigService extends IntentService {
                     + enablePublicSafetyMessagesChannelAlerts);
             log("enableStateLocalTestAlerts = " + enableStateLocalTestAlerts);
             log("enableEmergencyAlerts = " + enableEmergencyAlerts);
+            log("enableGeoFencingTriggerMessage = " + enableGeoFencingTriggerMessage);
         }
 
         /** Enable CMAS series messages. */
@@ -232,6 +235,11 @@ public class CellBroadcastConfigService extends IntentService {
                 CellBroadcastChannelManager.getInstance().getCellBroadcastChannelRanges(this,
                         R.array.state_local_test_alert_range_strings));
 
+        // Enable/Disable GSM geo-fencing trigger messages.
+        setCellBroadcastRange(manager, enableGeoFencingTriggerMessage,
+                CellBroadcastChannelManager.getInstance().getCellBroadcastChannelRanges(this,
+                        R.array.geo_fencing_trigger_messages_range_strings));
+
         /** Enable non-CMAS series messages. */
 
         setCellBroadcastRange(manager, enableEmergencyAlerts,