Merge "notify areaInfo update when main toggle state was changed" into mainline-prod am: b347401b55

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/13878623

Change-Id: I23d2e706b87292906454942b388033bd8ee8efa3

1 files changed, 11 insertions, 6 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index d1458c29a..63173bbea 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -428,12 +428,7 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
                             // check if area update was disabled
                             if (pref.getKey().equals(KEY_ENABLE_AREA_UPDATE_INFO_ALERTS)) {
                                 boolean isEnabledAlert = (Boolean) newValue;
-                                Intent areaInfoIntent = new Intent(AREA_INFO_UPDATE_ACTION);
-                                areaInfoIntent.putExtra(AREA_INFO_UPDATE_ENABLED_EXTRA,
-                                        isEnabledAlert);
-                                // sending broadcast protected by the permission which is only
-                                // granted for CBR mainline module.
-                                getContext().sendBroadcast(areaInfoIntent, CBR_MODULE_PERMISSION);
+                                notifyAreaInfoUpdate(isEnabledAlert);
                             }
 
                             // Notify backup manager a backup pass is needed.
@@ -716,6 +711,7 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
             if (mAreaUpdateInfoCheckBox != null) {
                 mAreaUpdateInfoCheckBox.setEnabled(alertsEnabled);
                 mAreaUpdateInfoCheckBox.setChecked(alertsEnabled);
+                notifyAreaInfoUpdate(alertsEnabled);
             }
             if (mEmergencyAlertsCheckBox != null) {
                 mEmergencyAlertsCheckBox.setEnabled(alertsEnabled);
@@ -743,6 +739,15 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
             }
         }
 
+        private void notifyAreaInfoUpdate(boolean enabled) {
+            Intent areaInfoIntent = new Intent(AREA_INFO_UPDATE_ACTION);
+            areaInfoIntent.putExtra(AREA_INFO_UPDATE_ENABLED_EXTRA, enabled);
+            // sending broadcast protected by the permission which is only
+            // granted for CBR mainline module.
+            getContext().sendBroadcast(areaInfoIntent, CBR_MODULE_PERMISSION);
+        }
+
+
         @Override
         public void onResume() {
             super.onResume();