From e1d4bc559154e6a9fea6a2b98c682eeddb07ca59 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 25 Jan 2024 23:46:51 +0000 Subject: [PATCH] Assert that at least one Weaver slot is used Uncomment an assertion that had been temporarily commented out because AOSP was out-of-date. This addresses a TODO in the code. Test: atest VtsHalWeaverTargetTest Change-Id: Ie572bb5fa05fcae3845aa46478cde0ac49206137 --- weaver/vts/VtsHalWeaverTargetTest.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/weaver/vts/VtsHalWeaverTargetTest.cpp b/weaver/vts/VtsHalWeaverTargetTest.cpp index 754d46710b..40e955808b 100644 --- a/weaver/vts/VtsHalWeaverTargetTest.cpp +++ b/weaver/vts/VtsHalWeaverTargetTest.cpp @@ -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;