Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51ba8c76 authored by Pavel Grafov's avatar Pavel Grafov Committed by android-build-merger
Browse files

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

am: 072b71f7

Change-Id: Id82d2c48b4463b9d0ec56e260e0f86a7d3b1f5e1
parents ddeb0a57 072b71f7

services/core/java/com/android/server/locksettings/LockSettingsService.java

+1 −0
Original line number Diff line number Diff line
@@ -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(