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

Merge "Load Weaver HAL if needed in destroyWeaverSlot()" into udc-dev

Browse Source
This commit is contained in:
Eric Biggers
2023-02-27 19:12:04 +00:00
committed by Android (Google) Code Review
parent 614750065f 8f5189dd60
commit 76bbdfda91
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -780,6 +780,10 @@ class SyntheticPasswordManager {
int slot = loadWeaverSlot(protectorId, userId); int slot = loadWeaverSlot(protectorId, userId);
destroyState(WEAVER_SLOT_NAME, protectorId, userId); destroyState(WEAVER_SLOT_NAME, protectorId, userId);
if (slot != INVALID_WEAVER_SLOT) { if (slot != INVALID_WEAVER_SLOT) {
if (!isWeaverAvailable()) {
Slog.e(TAG, "Cannot erase Weaver slot because Weaver is unavailable");
return;
}
Set<Integer> usedSlots = getUsedWeaverSlots(); Set<Integer> usedSlots = getUsedWeaverSlots();
if (!usedSlots.contains(slot)) { if (!usedSlots.contains(slot)) {
Slog.i(TAG, "Destroy weaver slot " + slot + " for user " + userId); Slog.i(TAG, "Destroy weaver slot " + slot + " for user " + userId);