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
This commit is contained in:
TreeHugger Robot
2017-08-09 10:17:09 +00:00
committed by Android (Google) Code Review
parent 07df171ac6 e195b94be6
commit 56385a796e
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(