summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorChen Xu <fionaxu@google.com>2020-10-19 15:29:23 -0700
committerChen Xu <fionaxu@google.com>2020-10-19 23:27:13 +0000
commitea772b0b412dbd2bf8f51955d2afe901ab2c7ccb (patch)
tree75bf3bc7b741f46e18b2a04d381ad8d503ac2d5d /legacy
parentbcd86a5ca234e48f6fd18b48549309ad79c5212e (diff)
downloadCellBroadcastReceiver-ea772b0b412dbd2bf8f51955d2afe901ab2c7ccb.tar.gz
support migrating alert reminder interval preference
Setting value of reminder interval is not miragted after OTA Bug: 170918387 Test: Manual test upgrade from Q to R Change-Id: Ia3fdf38dd5e7995d71fcfb16be1cfab773bc73b0
Diffstat (limited to 'legacy')
-rw-r--r--legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java b/legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java
index 758cec073..493d20d3e 100644
--- a/legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java
+++ b/legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java
@@ -22,6 +22,8 @@ import java.util.List;
public class LegacyCellBroadcastContentProvider extends ContentProvider {
// shared preference under developer settings
private static final String ENABLE_ALERT_MASTER_PREF = "enable_alerts_master_toggle";
+ // shared preference for alert reminder interval
+ private static final String ALERT_REMINDER_INTERVAL_PREF = "alert_reminder_interval";
private static final String TAG = LegacyCellBroadcastContentProvider.class.getSimpleName();
/** A list of preference supported by legacy app **/
@@ -37,7 +39,8 @@ public class LegacyCellBroadcastContentProvider extends ContentProvider {
CellBroadcasts.Preference.ENABLE_EMERGENCY_PERF,
CellBroadcasts.Preference.ENABLE_ALERT_VIBRATION_PREF,
CellBroadcasts.Preference.ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF,
- ENABLE_ALERT_MASTER_PREF
+ ENABLE_ALERT_MASTER_PREF,
+ ALERT_REMINDER_INTERVAL_PREF
);
/** The database for this content provider. */
@@ -79,7 +82,11 @@ public class LegacyCellBroadcastContentProvider extends ContentProvider {
// if preference value does not exists, return null.
if (sp != null && sp.contains(name)) {
Bundle result = new Bundle();
- result.putBoolean(name, sp.getBoolean(name, true));
+ if (ALERT_REMINDER_INTERVAL_PREF.equals(name)) {
+ result.putString(name, sp.getString(name, "0"));
+ } else {
+ result.putBoolean(name, sp.getBoolean(name, true));
+ }
Log.d(TAG, "migrate sharedpreference: " + name + " val: " + result.get(name));
return result;
}