diff options
| author | 2017-08-08 20:11:09 +0000 | |
|---|---|---|
| committer | 2017-08-08 20:11:09 +0000 | |
| commit | 072b71f73f499e0e2455e55f1e43fc6b492e1738 (patch) | |
| tree | 5bb20593243835f5b49e6338bb673ab1921b5296 | |
| parent | 7bec053dffb90f7cd0e39eec7f56fb33d847c3eb (diff) | |
| parent | e053c1e5fb69fa87c534f2ba489f10bdcac3120c (diff) | |
Merge "Mark profile password key as critical." into oc-mr1-dev
| -rw-r--r-- | services/core/java/com/android/server/locksettings/LockSettingsService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index a105c8414afe..2f166e932275 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -1223,6 +1223,7 @@ public class LockSettingsService extends ILockSettings.Stub { .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE) .setUserAuthenticationRequired(true) .setUserAuthenticationValidityDurationSeconds(30) + .setCriticalToDeviceEncryption(true) .build()); // Key imported, obtain a reference to it. SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey( |