From c12a9bd14858d241c46d148de026edcc3a2f9f47 Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Tue, 7 Feb 2017 17:49:41 -0800 Subject: [PATCH] Remove downloads backup related Settings. Bug: 32338407 Test: Coretest doesn't fail Change-Id: Idc28db30af9228e57c6bc775a15d703fbe25798a --- core/java/android/provider/Settings.java | 33 ------------------- .../src/android/provider/SettingsTest.java | 4 --- .../settings/SettingsProtoDumpUtil.java | 12 ------- 3 files changed, 49 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2936dfb591844..08aedc016f658 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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 diff --git a/core/tests/coretests/src/android/provider/SettingsTest.java b/core/tests/coretests/src/android/provider/SettingsTest.java index 1ff2056498f17..019f83751a65c 100644 --- a/core/tests/coretests/src/android/provider/SettingsTest.java +++ b/core/tests/coretests/src/android/provider/SettingsTest.java @@ -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, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 4ddafac1aca59..6552ad38fe18e 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -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);