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

Commit c12a9bd1 authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Remove downloads backup related Settings. 

Bug: 32338407
Test: Coretest doesn't fail
Change-Id: Idc28db30af9228e57c6bc775a15d703fbe25798a
parent c78d74e3

core/java/android/provider/Settings.java

+0 −33
Original line number Diff line number Diff line
@@ -6824,39 +6824,6 @@ public final class Settings { 
        public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =

                "system_navigation_keys_enabled";



        /**

         * Whether Downloads folder backup is enabled and should run on the device.

         *

         * @hide

         */

        public static final String DOWNLOADS_BACKUP_ENABLED = "downloads_backup_enabled";



        /**

         * Whether Downloads folder backup should only occur if the device is using a metered

         * network.

         *

         * @hide

         */

        public static final String DOWNLOADS_BACKUP_ALLOW_METERED =

                "downloads_backup_allow_metered";



        /**

         * Whether Downloads folder backup should only occur if the device is charging.

         *

         * @hide

         */

        public static final String DOWNLOADS_BACKUP_CHARGING_ONLY =

                "downloads_backup_charging_only";



        /**

         * How many days of information for the automatic storage manager to retain on the device

         * for downloads.

         *

         * @hide

         */

        public static final String AUTOMATIC_STORAGE_MANAGER_DOWNLOADS_DAYS_TO_RETAIN =

                "automatic_storage_manager_downloads_days_to_retain";



        /**

         * Holds comma separated list of ordering of QS tiles.

         * @hide

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

+0 −4
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ public class SettingsTest { 
                 Settings.Secure.AUTO_FILL_SERVICE,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DOWNLOADS_DAYS_TO_RETAIN,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN,

                 Settings.Secure.BACKUP_AUTO_RESTORE,
@@ -402,9 +401,6 @@ public class SettingsTest { 
                 Settings.Secure.DISABLED_PRINT_SERVICES,

                 Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS,

                 Settings.Secure.DISPLAY_DENSITY_FORCED,

                 Settings.Secure.DOWNLOADS_BACKUP_ALLOW_METERED,  // Candidate?

                 Settings.Secure.DOWNLOADS_BACKUP_CHARGING_ONLY, // Candidate?

                 Settings.Secure.DOWNLOADS_BACKUP_ENABLED, // Candidate?

                 Settings.Secure.DOZE_ALWAYS_ON,

                 Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,

                 Settings.Secure.ENABLED_NOTIFICATION_ASSISTANT,

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

+0 −12
Original line number Diff line number Diff line
@@ -1425,18 +1425,6 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED,

                SecureSettingsProto.SYSTEM_NAVIGATION_KEYS_ENABLED);

        dumpSetting(s, p,

                Settings.Secure.DOWNLOADS_BACKUP_ENABLED,

                SecureSettingsProto.DOWNLOADS_BACKUP_ENABLED);

        dumpSetting(s, p,

                Settings.Secure.DOWNLOADS_BACKUP_ALLOW_METERED,

                SecureSettingsProto.DOWNLOADS_BACKUP_ALLOW_METERED);

        dumpSetting(s, p,

                Settings.Secure.DOWNLOADS_BACKUP_CHARGING_ONLY,

                SecureSettingsProto.DOWNLOADS_BACKUP_CHARGING_ONLY);

        dumpSetting(s, p,

                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DOWNLOADS_DAYS_TO_RETAIN,

                SecureSettingsProto.AUTOMATIC_STORAGE_MANAGER_DOWNLOADS_DAYS_TO_RETAIN);

        dumpSetting(s, p,

                Settings.Secure.QS_TILES,

                SecureSettingsProto.QS_TILES);