diff options
| author | 2015-04-17 16:41:25 +0000 | |
|---|---|---|
| committer | 2015-04-17 16:41:27 +0000 | |
| commit | fedd63165d0cd852c129c3fa18a0849f5de9dfb1 (patch) | |
| tree | 72c9e8a0ee54dfeb419c97bd2aa69c7f54b3c7f1 | |
| parent | fd25459a523f84c293989ceeb7853dc0a9e1daed (diff) | |
| parent | 95bbbdd097fb9ac410ca829df4be4e90992d2b48 (diff) | |
Merge "Set REQUIRE_PASSWORD_TO_DECRYPT to false when insecure screen lock is enabled"
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 123d1ac21b97..aa60ebac95a3 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -472,6 +472,8 @@ public class LockPatternUtils { updateEncryptionPassword(StorageManager.CRYPT_TYPE_DEFAULT, null); } + setCredentialRequiredToDecrypt(false); + getDevicePolicyManager().setActivePasswordState( DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0, 0, 0, 0, 0, 0, userHandle); |