summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2015-12-03 14:27:34 -0500
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-16 02:42:15 +0100
commit73e4ff6ef31cce010d31bf4b0bd8990a7bfd85bc (patch)
treebd72a6389e80f995a885267512df50ded75261c4 /core/java/android/provider/Settings.java
parent34cb7bda51ec5716f24db107532555d64afa7177 (diff)
downloadframeworks_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 'core/java/android/provider/Settings.java')
-rw-r--r--core/java/android/provider/Settings.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 3ab16fe..e6f1f4a 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4926,6 +4926,13 @@ public final class Settings {
"lock_screen_allow_private_notifications";
/**
+ * Separate password for encryption and the lockscreen.
+ * @hide
+ */
+ public static final String LOCK_SEPARATE_ENCRYPTION_PASSWORD =
+ "lock_separate_encryption_password";
+
+ /**
* Set by the system to track if the user needs to see the call to action for
* the lockscreen notification policy.
* @hide