Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Nishi
2017-07-06 21:58:41 +00:00
committed by Android (Google) Code Review
parent 457c58f912 fa1143658b
commit a48cf1e619
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -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

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -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,