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

Commit 59cb2ee3 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Load Weaver HAL if needed in destroyWeaverSlot()" into udc-dev am: 76bbdfda 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21568578



Change-Id: Id03d65394bfaa82ec5c4164b87e18666251cf14d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b2ccdba 76bbdfda

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

+4 −0
Original line number Diff line number Diff line
@@ -780,6 +780,10 @@ class SyntheticPasswordManager { 
        int slot = loadWeaverSlot(protectorId, userId);

        destroyState(WEAVER_SLOT_NAME, protectorId, userId);

        if (slot != INVALID_WEAVER_SLOT) {

            if (!isWeaverAvailable()) {

                Slog.e(TAG, "Cannot erase Weaver slot because Weaver is unavailable");

                return;

            }

            Set<Integer> usedSlots = getUsedWeaverSlots();

            if (!usedSlots.contains(slot)) {

                Slog.i(TAG, "Destroy weaver slot " + slot + " for user " + userId);