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

Merge "Destroy secdiscardable file in destroyProtectorCommon()"

Browse Source
This commit is contained in:
Eric Biggers
2022-07-28 17:04:11 +00:00
committed by Android (Google) Code Review
parent bae1ae44c3 595976d265
commit 96fd0aed03
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
View File

@@ -1308,7 +1308,6 @@ public class SyntheticPasswordManager {
SyntheticPasswordBlob blob = SyntheticPasswordBlob.fromBytes(loadState(SP_BLOB_NAME,
protectorId, userId));
destroyProtectorCommon(protectorId, userId);
destroyState(SECDISCARDABLE_NAME, protectorId, userId);
if (blob.mProtectorType == PROTECTOR_TYPE_WEAK_TOKEN_BASED) {
notifyWeakEscrowTokenRemovedListeners(protectorId, userId);
}
@@ -1332,7 +1331,6 @@ public class SyntheticPasswordManager {
*/
public void destroyLskfBasedProtector(long protectorId, int userId) {
destroyProtectorCommon(protectorId, userId);
destroyState(SECDISCARDABLE_NAME, protectorId, userId);
destroyState(PASSWORD_DATA_NAME, protectorId, userId);
destroyState(PASSWORD_METRICS_NAME, protectorId, userId);
}
@@ -1340,6 +1338,7 @@ public class SyntheticPasswordManager {
private void destroyProtectorCommon(long protectorId, int userId) {
destroyState(SP_BLOB_NAME, protectorId, userId);
destroySPBlobKey(getKeyName(protectorId));
destroyState(SECDISCARDABLE_NAME, protectorId, userId);
if (hasState(WEAVER_SLOT_NAME, protectorId, userId)) {
destroyWeaverSlot(protectorId, userId);
}