summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-10-25 00:36:33 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-10-25 00:36:33 +0000
commit30269fb2b46a40bc836d9541b2275f6800c97661 (patch)
tree9b65e03494ec7c0d20e30efe2e2bdc6e3ce4278c
parentbdfb0dd6ea44294e09c81b832ff471c8bac798a5 (diff)
parentfdc77b6032f43442615d2c1b4d32d0e8526fece2 (diff)
downloadandroid_packages_apps_CellBroadcastReceiver-staging/lineage-17.0_merge-android-10.0.0_r9.tar.gz
android_packages_apps_CellBroadcastReceiver-staging/lineage-17.0_merge-android-10.0.0_r9.tar.bz2
android_packages_apps_CellBroadcastReceiver-staging/lineage-17.0_merge-android-10.0.0_r9.zip
Merge cherrypicks of [9612764, 9611353, 9611678, 9611613, 9611614, 9611705, 9611706, 9611707, 9611708, 9611709, 9611615] into qt-qpr1-b-releasestaging/lineage-17.0_merge-android-10.0.0_r9
Change-Id: Id483057c9b40b2ab6a265930d33be154cc06dcb0
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index d1d1eafc..ec526573 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -236,7 +236,7 @@ public class CellBroadcastConfigService extends IntentService {
R.array.state_local_test_alert_range_strings));
// Enable/Disable GSM geo-fencing trigger messages.
- setCellBroadcastRange(manager, enableStateLocalTestAlerts,
+ setCellBroadcastRange(manager, enableGeoFencingTriggerMessage,
CellBroadcastChannelManager.getInstance().getCellBroadcastChannelRanges(this,
R.array.geo_fencing_trigger_messages_range_strings));