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

Commit e9558bae authored by Shilpa Satish's avatar Shilpa Satish
Browse files

Adding CONNECTIVITY_KEEP_DATA_ON to handle Safety Situation 

Bug: 302057004
Test: Manual | Units Tests

Change-Id: I2228a8f91e716ea33e081577ba522ea7023898e6
parent 0758ffb5

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -19038,6 +19038,14 @@ public final class Settings { 
             */

            public static final int BATTERY_SAVER_MODE_CUSTOM = 4;













            /**













             Whether 1P apps vote for enabling data during different modes,













             i.e. BTM, BBSM













             * @hide













             */













            @Readable(maxTargetSdk = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)













            public static final String CONNECTIVITY_KEEP_DATA_ON = "wear_connectivity_keep_data_on";



























            /**















             * The maximum ambient mode duration when an activity is allowed to auto resume.















             * @hide

























packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -445,5 +445,6 @@ public class GlobalSettingsValidators {













        VALIDATORS.put(Global.Wearable.PHONE_SWITCHING_SUPPORTED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.WEAR_LAUNCHER_UI_MODE, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Global.Wearable.CONNECTIVITY_KEEP_DATA_ON, BOOLEAN_VALIDATOR);















    }















}
























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -686,7 +686,8 @@ public class SettingsBackupTest {













                    Settings.Global.Wearable.PHONE_SWITCHING_SUPPORTED,















                    Settings.Global.Wearable.WEAR_MEDIA_CONTROLS_PACKAGE,















                    Settings.Global.Wearable.WEAR_MEDIA_SESSIONS_PACKAGE,













                    Settings.Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED);













                    Settings.Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED,













                    Settings.Global.Wearable.CONNECTIVITY_KEEP_DATA_ON);































    private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =















             newHashSet(