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

am: 56385a796e Change-Id: Ifc9e96958b43f29dd60aea801c3d8c586c651735
2017-08-09 10:29:03 +00:00
parent b11b64a491 56385a796e
commit d7172c2ae3
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -1235,6 +1235,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(