commit da7332c0707094b66e9a2e22f4c64cf9520cfddb
author Daniel Nishi <dhnishi@google.com> Mon Jun 12 10:17:33 2017 -0700
committer Daniel Nishi <dhnishi@google.com> Wed Jul 05 16:52:26 2017 -0700
tree 58843a0f0ddcf5e9f82e385d26749a42759a6626
parent b455540bfe934e566daa4723cd5aeeb9d938a895

Add a Setting for whether or not we have been disabled by policy.

Bug: 62106274, 35698183
Test: StorageManager robotests

Change-Id: I1788d6143362130df88950c6843fa78b67182d5e

core/tests/coretests/src/android/provider/SettingsBackupTest.java

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,