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

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

Merge "Assert that at least one Weaver slot is used" into main am: 4a3ca1b4 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2928792



Change-Id: Ib85903d5933b938a0f21460ad6174384d7183d1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ce527e8 4a3ca1b4

weaver/vts/VtsHalWeaverTargetTest.cpp

+2 −3
Original line number Diff line number Diff line
@@ -222,9 +222,8 @@ void WeaverTest::FindFreeSlots() { 
    }

    // Starting in Android 14, the system will always use at least one Weaver slot if Weaver is

    // supported at all.  Make sure we saw at least one.

    // TODO: uncomment after Android 14 is merged into AOSP

    // ASSERT_FALSE(used_slots.empty())

    //<< "Could not determine which Weaver slots are in use by the system";

    ASSERT_FALSE(used_slots.empty())

            << "Could not determine which Weaver slots are in use by the system";



    // Find the first free slot.

    int found = 0;