Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b766168 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add Settings.Global keys for Dsrm plus feature" into udc-qpr-dev am:... 

Merge "Add Settings.Global keys for Dsrm plus feature" into udc-qpr-dev am: 8df6d8c7 am: 48e84a63

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23486251



Change-Id: I59b95afad2d8975dbe49e3dafdb57f3f4591ee36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af10dd15 48e84a63

core/java/android/provider/Settings.java

+20 −0
Original line number Diff line number Diff line
@@ -12695,6 +12695,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.

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -346,6 +346,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,