summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eugene Susla <eugenesusla@google.com> 2020-03-27 15:35:02 -0700
committer Eugene Susla <eugenesusla@google.com> 2020-03-30 12:29:26 -0700
commitc6909ffe20a4715251dfac7d5aa4ec256afd3a2c (patch)
treec2046a94ec02c736aea56fa69cce027c872906b1
parentd8cf9a98ed7e02638cfc03bd0313f5e0ed8cfd78 (diff)
Introduce a Setting for auto revoke teamfood settings
Test: presubmit Bug: 146513245 Change-Id: I57e20694528e6e2e94957e66d03cbf292c305f0d
-rw-r--r--core/java/android/provider/Settings.java17
-rw-r--r--packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java1
2 files changed, 18 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 530585d86465..d06cd2265a23 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -14176,6 +14176,23 @@ public final class Settings {
"appop_history_parameters";
/**
+ * Auto revoke parameters. These parameters are represented by
+ * a comma-delimited key-value list.
+ *
+ * <pre>
+ * enabledForPreRApps (bolean)
+ * unusedThresholdMs (long)
+ * checkFrequencyMs (long)
+ * </pre>
+ *
+ * Ex: "enabledForPreRApps=false,unusedThresholdMs=7776000000,checkFrequencyMs=1296000000"
+ *
+ * @hide
+ */
+ public static final String AUTO_REVOKE_PARAMETERS =
+ "auto_revoke_parameters";
+
+ /**
* Delay for sending ACTION_CHARGING after device is plugged in.
* This is used as an override for constants defined in BatteryStatsImpl for
* ease of experimentation.
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index a36949b9e1ff..589342a12b29 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -575,6 +575,7 @@ public class SettingsBackupTest {
Settings.Global.APPOP_HISTORY_MODE,
Settings.Global.APPOP_HISTORY_INTERVAL_MULTIPLIER,
Settings.Global.APPOP_HISTORY_BASE_INTERVAL_MILLIS,
+ Settings.Global.AUTO_REVOKE_PARAMETERS,
Settings.Global.ENABLE_RADIO_BUG_DETECTION,
Settings.Global.RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD,
Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD,