Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev

2016-05-25 00:10:55 +00:00
parent 8943d9dff4 395d387c2c
commit 9746deefbb
1 changed files with 8 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6219,6 +6219,14 @@ public final class Settings {
        public static final String MANAGED_PROFILE_CONTACT_REMOTE_SEARCH =
                "managed_profile_contact_remote_search";

+        /**
+         * Whether or not the automatic storage manager is enabled and should run on the device.
+         *
+         * @hide
+         */
+        public static final String AUTOMATIC_STORAGE_MANAGER_ENABLED =
+                "automatic_storage_manager_enabled";
+
        /**
         * This are the settings to be backed up.
         *