From f0bc8660d2b2e746f884f89324104a8420818d80 Mon Sep 17 00:00:00 2001
From: Allison Babick <ababick@google.com>
Date: Mon, 11 Jul 2016 15:39:16 -0700
Subject: [PATCH] Add user-modifiable downloads backup conditions.

Add the user-modifiable fields to Settings.Secure.

Bug: 29829743
Change-Id: Ic56523948974974b11b114fb5fca1517414f3728
---
 core/java/android/provider/Settings.java | 30 ++++++++++++++++++------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 73b5c639f9927..2f3d3ea564b0f 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6302,13 +6302,6 @@ public final class Settings {
         public static final String AUTOMATIC_STORAGE_MANAGER_LAST_RUN =
                 "automatic_storage_manager_last_run";
 
-        /**
-         * Whether Downloads folder backup is enabled and should run on the device.
-         *
-         * @hide
-         */
-        public static final String DOWNLOADS_BACKUP_ENABLED = "downloads_backup_enabled";
-
         /**
          * Whether SystemUI navigation keys is enabled.
          * @hide
@@ -6316,6 +6309,29 @@ 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";
 
         /**
          * This are the settings to be backed up.