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

Commit fb4482b3 authored by Eric Biggers's avatar Eric Biggers Committed by Gerrit Code Review
Browse files

Merge "Remove the used_slots assertion from VtsHalWeaverTargetTest" into main

parents 65b88061 649c20ef
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -220,13 +220,10 @@ void WeaverTest::FindFreeSlots() {
            used_slots.insert(slot);
        }
    }
    // Starting in Android 14, the system will always use at least one Weaver slot if Weaver is
    // supported at all.  This is true even if an LSKF hasn't been set yet, since Weaver is used to
    // protect the initial binding of each user's synthetic password to ensure that binding can be
    // securely deleted if an LSKF is set later.  Make sure we saw at least one slot, as otherwise
    // the Weaver implementation must have a bug that makes it not fully usable by Android.
    ASSERT_FALSE(used_slots.empty())
            << "Could not determine which Weaver slots are in use by the system";

    // We should assert !used_slots.empty() here, but that can't be done yet due to
    // config_disableWeaverOnUnsecuredUsers being supported.  The value of that option is not
    // accessible from here, so we have to assume it might be set to true.

    // Find the first free slot.
    int found = 0;