commit fa1143658b7f9be1f9009b209e76663db7db75a2
author Daniel Nishi <dhnishi@google.com> Mon Jun 12 10:17:33 2017 -0700
committer Daniel Nishi <dhnishi@google.com> Thu Jul 06 20:00:25 2017 +0000
tree c50828ccf0406ae24adc89f1db95c5160b957289
parent 21fe942d88d839db2e9dec3dc165ef976fcba2dd

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

Bug: 62106274, 35698183
Test: StorageManager robotests
Merged-In: I1788d6143362130df88950c6843fa78b67182d5e
(cherry picked from commit da7332c0707094b66e9a2e22f4c64cf9520cfddb)

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 f02c45c..c35d16a 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -410,6 +410,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,