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

Commit d72acb3b 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 

am: 51ba8c76

Change-Id: I415126156d87e37b450d1ee9994abb06e9259279
parents 06525c20 51ba8c76

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -1223,6 +1223,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
                                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)

                                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)

                                .setUserAuthenticationRequired(true)

                                .setUserAuthenticationRequired(true)

                                .setUserAuthenticationValidityDurationSeconds(30)

                                .setUserAuthenticationValidityDurationSeconds(30)

                                .setCriticalToDeviceEncryption(true)

                                .build());

                                .build());

                // Key imported, obtain a reference to it.

                // Key imported, obtain a reference to it.

                SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey(

                SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey(