From 6b519818c7c642fa781160001fae35faca054211 Mon Sep 17 00:00:00 2001 From: Diaesh Antony Date: Wed, 24 May 2023 05:32:19 +0000 Subject: [PATCH] Add Settings.Global keys for Dsrm plus feature Bug: 283897403 Test: atest SettingsBackupTest Change-Id: I1db4dbe10a5da67e97365cfb571f3eb682ca67e5 Signed-off-by: Diaesh Antony --- core/java/android/provider/Settings.java | 20 +++++++++++++++++++ .../android/provider/SettingsBackupTest.java | 2 ++ 2 files changed, 22 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d425bf8ae5575..820f454abe805 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12612,6 +12612,26 @@ public final class Settings { @Readable public static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on"; + /** + * The duration in milliseconds of each action, separated by commas. Ex: + * + * "18000,18000,18000,18000,0" + * + * See com.android.internal.telephony.data.DataStallRecoveryManager for more info + * @hide + */ + public static final String DSRM_DURATION_MILLIS = "dsrm_duration_millis"; + + /** + * The list of DSRM enabled actions, separated by commas. Ex: + * + * "true,true,false,true,true" + * + * See com.android.internal.telephony.data.DataStallRecoveryManager for more info + * @hide + */ + public static final String DSRM_ENABLED_ACTIONS = "dsrm_enabled_actions"; + /** * Whether the wifi data connection should remain active even when higher * priority networks like Ethernet are active, to keep both networks. diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index dd8eb3b3f3fb2..c740423c39af6 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -345,6 +345,8 @@ public class SettingsBackupTest { Settings.Global.MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS, Settings.Global.MOBILE_DATA, // Candidate for backup? Settings.Global.MOBILE_DATA_ALWAYS_ON, + Settings.Global.DSRM_DURATION_MILLIS, + Settings.Global.DSRM_ENABLED_ACTIONS, Settings.Global.MODE_RINGER, Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION, Settings.Global.MULTI_SIM_SMS_PROMPT,