Add a Setting for whether or not we have been disabled by policy.
Bug: 62106274, 35698183
Test: StorageManager robotests
Change-Id: I1788d6143362130df88950c6843fa78b67182d5e
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index b710cf1..1ae9e15 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7023,6 +7023,16 @@
"automatic_storage_manager_last_run";
/**
+ * If the automatic storage manager has been disabled by policy. Note that this doesn't
+ * mean that the automatic storage manager is prevented from being re-enabled -- this only
+ * means that it was turned off by policy at least once.
+ *
+ * @hide
+ */
+ public static final String AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY =
+ "automatic_storage_manager_turned_off_by_policy";
+
+ /**
* Whether SystemUI navigation keys is enabled.
* @hide
*/
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index b96bda1..956c862 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -418,6 +418,7 @@
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED,
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN,
+ Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,
Settings.Secure.BACKUP_AUTO_RESTORE,
Settings.Secure.BACKUP_ENABLED,
Settings.Secure.BACKUP_PROVISIONED,