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

am: 072b71f73f Change-Id: Id82d2c48b4463b9d0ec56e260e0f86a7d3b1f5e1
2017-08-08 20:21:24 +00:00
parent ddeb0a578a 072b71f73f
commit 51ba8c7605
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(