diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2015-12-03 14:27:34 -0500 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-16 02:42:15 +0100 |
| commit | 73e4ff6ef31cce010d31bf4b0bd8990a7bfd85bc (patch) | |
| tree | bd72a6389e80f995a885267512df50ded75261c4 /services/core/java/com/android/server/LockSettingsService.java | |
| parent | 34cb7bda51ec5716f24db107532555d64afa7177 (diff) | |
| download | frameworks_base-73e4ff6ef31cce010d31bf4b0bd8990a7bfd85bc.zip frameworks_base-73e4ff6ef31cce010d31bf4b0bd8990a7bfd85bc.tar.gz frameworks_base-73e4ff6ef31cce010d31bf4b0bd8990a7bfd85bc.tar.bz2 | |
support separate encryption/lockscreen passwords
This adds the necessary infrastructure for allowing users to opt-in to a
distinct device encryption passphrase. The passwords are still tied
together by default. This makes it possible to use a complex encryption
passphrase without losing the convenience of a very simple lockscreen
pin.
This feature can be combined with a forced reboot after a chosen number
of failed unlocking attempts to prevent brute-forcing by requiring the
entry of the encryption password instead.
Diffstat (limited to 'services/core/java/com/android/server/LockSettingsService.java')
| -rw-r--r-- | services/core/java/com/android/server/LockSettingsService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index 10b0bdd..81cbc19 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -839,6 +839,7 @@ public class LockSettingsService extends ILockSettings.Stub { Secure.LOCK_PATTERN_SIZE, Secure.LOCK_DOTS_VISIBLE, Secure.LOCK_SHOW_ERROR_PATH, + Secure.LOCK_SEPARATE_ENCRYPTION_PASSWORD }; // Reading these settings needs the contacts permission |