diff options
| author | Jim Miller <jaggies@google.com> | 2014-10-15 18:26:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-15 18:26:59 +0000 |
| commit | 09ba0da87fa56eac91da5eb2d0a20b7799df66d5 (patch) | |
| tree | 8fd1bf03c295e04c2c132c06b1fd21096b865211 /core/java/android/provider | |
| parent | 01ddc75fc1e9ea28212512299132e9bdace60e05 (diff) | |
| parent | e7c325559d961f13c6df96803bca4747f41b27a4 (diff) | |
| download | frameworks_base-09ba0da87fa56eac91da5eb2d0a20b7799df66d5.zip frameworks_base-09ba0da87fa56eac91da5eb2d0a20b7799df66d5.tar.gz frameworks_base-09ba0da87fa56eac91da5eb2d0a20b7799df66d5.tar.bz2 | |
am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
Add a checkbox option to 'require password to decrypt'
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e40c88f..79e84d9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6570,6 +6570,15 @@ public final class Settings { public static final String NETWORK_SCORING_PROVISIONED = "network_scoring_provisioned"; /** + * Whether the user wants to be prompted for password to decrypt the device on boot. + * This only matters if the storage is encrypted. + * <p> + * Type: int (0 for false, 1 for true) + * @hide + */ + public static final String REQUIRE_PASSWORD_TO_DECRYPT = "require_password_to_decrypt"; + + /** * Settings to backup. This is here so that it's in the same place as the settings * keys and easy to update. * |