From fa1143658b7f9be1f9009b209e76663db7db75a2 Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Mon, 12 Jun 2017 10:17:33 -0700 Subject: 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/java/android/provider/Settings.java | 10 ++++++++++ .../coretests/src/android/provider/SettingsBackupTest.java | 1 + 2 files changed, 11 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7829df5f578a..316110e4390c 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6988,6 +6988,16 @@ public final class Settings { public static final String AUTOMATIC_STORAGE_MANAGER_LAST_RUN = "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 f02c45c44ffe..c35d16acfb9d 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -410,6 +410,7 @@ public class SettingsBackupTest { 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, -- cgit v1.2.3-59-g8ed1b