diff options
| author | Jim Miller <jaggies@google.com> | 2014-10-15 18:21:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-15 18:21:52 +0000 |
| commit | e7c325559d961f13c6df96803bca4747f41b27a4 (patch) | |
| tree | 72d8e56a2ee86f31cb6f2beab45bf3c446276782 /core/java/android/provider | |
| parent | 2c3886cb3463ff39c1986c5b85eba79748dd8c24 (diff) | |
| parent | 6848dc8e3b54fb27047836d8026c4c9971754607 (diff) | |
| download | frameworks_base-e7c325559d961f13c6df96803bca4747f41b27a4.zip frameworks_base-e7c325559d961f13c6df96803bca4747f41b27a4.tar.gz frameworks_base-e7c325559d961f13c6df96803bca4747f41b27a4.tar.bz2 | |
Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev
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. * |