Merge "Mark profile password key as critical." into oc-mr1-dev am: 072b71f73f

am: 51ba8c7605 Change-Id: I415126156d87e37b450d1ee9994abb06e9259279
2017-08-08 20:35:42 +00:00
parent 06525c209e 51ba8c7605
commit d72acb3bd4
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
@@ -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(