Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 932f3605 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev 

am: a48cf1e6

Change-Id: I4a1531a293f5c3493db22f73bc5511a97e756f52
parents 0a97a0e7 a48cf1e6

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -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

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

+1 −0
Original line number Diff line number Diff line
@@ -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,