Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not remove the k_k until all users are unlocked"

Browse Source
This commit is contained in:
Tianjie Xu
2021-01-15 01:06:05 +00:00
committed by Gerrit Code Review
parent 2a24bb672f 4ec033ca8a
commit 4d20410bf4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/locksettings/RebootEscrowManager.java
View File

@@ -224,6 +224,10 @@ class RebootEscrowManager {
for (UserInfo user : rebootEscrowUsers) { for (UserInfo user : rebootEscrowUsers) {
allUsersUnlocked &= restoreRebootEscrowForUser(user.id, escrowKey, kk); allUsersUnlocked &= restoreRebootEscrowForUser(user.id, escrowKey, kk);
} }
// Clear the old key in keystore. A new key will be generated by new RoR requests.
mKeyStoreManager.clearKeyStoreEncryptionKey();
onEscrowRestoreComplete(allUsersUnlocked); onEscrowRestoreComplete(allUsersUnlocked);
} }
@@ -273,9 +277,6 @@ class RebootEscrowManager {
} catch (IOException e) { } catch (IOException e) {
Slog.w(TAG, "Could not load reboot escrow data for user " + userId, e); Slog.w(TAG, "Could not load reboot escrow data for user " + userId, e);
return false; return false;
} finally {
// Clear the old key in keystore. A new key will be generated by new RoR requests.
mKeyStoreManager.clearKeyStoreEncryptionKey();
} }
} }