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

Commit 1375406c authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Handle incomplete protectors in destroyAllWeakTokenBasedProtectors() am: 397f5416 

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



Change-Id: Ie8dcfce4bbf12ed8c24d2f7d93890a2bdd62a781
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88793a83 397f5416

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

+1 −1
Original line number Diff line number Diff line
@@ -1602,7 +1602,7 @@ class SyntheticPasswordManager { 
    /** Destroy all weak token-based SP protectors for the given user. */

    public void destroyAllWeakTokenBasedProtectors(int userId) {

        List<Long> protectorIds =

            mStorage.listSyntheticPasswordProtectorsForUser(SECDISCARDABLE_NAME, userId);

            mStorage.listSyntheticPasswordProtectorsForUser(SP_BLOB_NAME, userId);

        for (long protectorId : protectorIds) {

            SyntheticPasswordBlob blob = SyntheticPasswordBlob.fromBytes(loadState(SP_BLOB_NAME,

                    protectorId, userId));