Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark profile password key as critical." into oc-dr1-dev

Browse Source 
am: 56385a796e

Change-Id: Ifc9e96958b43f29dd60aea801c3d8c586c651735
This commit is contained in:
Pavel Grafov
2017-08-09 10:29:03 +00:00
committed by android-build-merger
parent b11b64a491 56385a796e
commit d7172c2ae3
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -1235,6 +1235,7 @@ public class LockSettingsService extends ILockSettings.Stub {
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE) .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
.setUserAuthenticationRequired(true) .setUserAuthenticationRequired(true)
.setUserAuthenticationValidityDurationSeconds(30) .setUserAuthenticationValidityDurationSeconds(30)
.setCriticalToDeviceEncryption(true)
.build()); .build());
// Key imported, obtain a reference to it. // Key imported, obtain a reference to it.
SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey( SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey(