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

Commit 8c8ded0e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a backup manager constants secure settings."

parents b16d32bc cc1e76a4

core/java/android/provider/Settings.java

+25 −0
Original line number Diff line number Diff line
@@ -7146,6 +7146,31 @@ public final class Settings { 
         * @hide

         */

        public static final String LOCKDOWN_IN_POWER_MENU = "lockdown_in_power_menu";



        /**

         * Backup manager behavioral parameters.

         * This is encoded as a key=value list, separated by commas. Ex:

         *

         * "key_value_backup_interval_milliseconds=14400000,key_value_backup_require_charging=true"

         *

         * The following keys are supported:

         *

         * <pre>

         * key_value_backup_interval_milliseconds  (long)

         * key_value_backup_fuzz_milliseconds      (long)

         * key_value_backup_require_charging       (boolean)

         * key_value_backup_required_network_type  (int)

         * full_backup_interval_milliseconds       (long)

         * full_backup_require_charging            (boolean)

         * full_backup_required_network_type       (int)

         * </pre>

         *

         * <p>

         * Type: string

         * @hide

         */

        public static final String BACKUP_MANAGER_CONSTANTS = "backup_manager_constants";



        /**

         * This are the settings to be backed up.

         *

core/proto/android/providers/settings.proto

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ message SecureSettingsProto { 
    SettingProto instant_apps_enabled = 166;

    SettingProto device_paired = 167;

    SettingProto notification_badging = 168;

    SettingProto backup_manager_constants = 169;

}



message SystemSettingsProto {

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+2 −1
Original line number Diff line number Diff line
@@ -505,7 +505,8 @@ public class SettingsBackupTest { 
                 Settings.Secure.USER_SETUP_COMPLETE,

                 Settings.Secure.VOICE_INTERACTION_SERVICE,

                 Settings.Secure.VOICE_RECOGNITION_SERVICE,

                 Settings.Secure.INSTANT_APPS_ENABLED);

                 Settings.Secure.INSTANT_APPS_ENABLED,

                 Settings.Secure.BACKUP_MANAGER_CONSTANTS);



    @Test

    public void systemSettingsBackedUpOrBlacklisted() {

packages/SettingsProvider/res/values/defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -190,4 +190,7 @@ 


    <!-- default setting for Settings.Global.DEFAULT_RESTRICT_BACKGROUND_DATA -->

    <bool name="def_restrict_background_data">false</bool>



    <!-- Default for Settings.Secure.BACKUP_MANAGER_CONSTANTS -->

    <string name="def_backup_manager_constants"></string>

</resources>

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+3 −0
Original line number Diff line number Diff line
@@ -1443,6 +1443,9 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                Settings.Secure.NOTIFICATION_BADGING,

                SecureSettingsProto.NOTIFICATION_BADGING);

        dumpSetting(s, p,

                Settings.Secure.BACKUP_MANAGER_CONSTANTS,

                SecureSettingsProto.BACKUP_MANAGER_CONSTANTS);

    }



    private static void dumpProtoSystemSettingsLocked(