diff options
| author | 2017-08-08 16:53:32 +0100 | |
|---|---|---|
| committer | 2017-08-08 17:11:36 +0100 | |
| commit | e053c1e5fb69fa87c534f2ba489f10bdcac3120c (patch) | |
| tree | 3c752a807f3c1e116dc16cefb92e6bc8f92763d8 | |
| parent | aac5431f6bc11e02d893199c40abb640110705ad (diff) | |
Mark profile password key as critical.
Currently it is erased when keystore for user 0 is cleared, e.g.
when the user clears data for Settings app.
Bug: 64467610
Bug: 35929605
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
| -rw-r--r-- | services/core/java/com/android/server/locksettings/LockSettingsService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index a105c8414afe..2f166e932275 100644 --- 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( |