summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAnnie Meng <anniemeng@google.com>2018-03-16 10:25:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-16 10:25:32 +0000
commitec243338ea4c53bd24aaece7382ede4a8c85faeb (patch)
treedfd43911bea43e6eb92faa800e6e2d85213f8ee1 /core/java/android
parent78e4f84f045d2452f59c6ebea81493bd9894aa1b (diff)
parentd069a888cf32f105bf6843a7083770f5b82af74e (diff)
Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java22
1 files changed, 22 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 2b5cece4bb35..e46a5f05c48d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -12338,6 +12338,28 @@ public final class Settings {
* @hide
*/
public static final String SHOW_ZEN_UPGRADE_NOTIFICATION = "show_zen_upgrade_notification";
+
+ /**
+ * Backup and restore agent timeout parameters.
+ * These parameters are represented by a comma-delimited key-value list.
+ *
+ * The following strings are supported as keys:
+ * <pre>
+ * kv_backup_agent_timeout_millis (long)
+ * full_backup_agent_timeout_millis (long)
+ * shared_backup_agent_timeout_millis (long)
+ * restore_agent_timeout_millis (long)
+ * restore_agent_finished_timeout_millis (long)
+ * </pre>
+ *
+ * They map to milliseconds represented as longs.
+ *
+ * Ex: "kv_backup_agent_timeout_millis=30000,full_backup_agent_timeout_millis=300000"
+ *
+ * @hide
+ */
+ public static final String BACKUP_AGENT_TIMEOUT_PARAMETERS =
+ "backup_agent_timeout_parameters";
}
/**