From a41f25b14e8d35d2a8a3832e2343ff01e58f8544 Mon Sep 17 00:00:00 2001 From: Mathieu Mandret Date: Wed, 13 Mar 2024 14:51:32 +0100 Subject: [PATCH] Disable UWB before starting VtsHalUwbTargetTest VtsHalUwbTargetTest opens/closes UWB HAL multiple times. However UWB HAL only accepts 1 client at a time so if UWB is enabled Android Framework will have UWB HAL open and prevent any other client from opening it. Matching NFC VTS behavior from VtsAidlHalNfcTargetTest.cpp, VtsHalUwbTargetTest now disables UWB before running its tests. Test: atest VtsHalUwbTargetTest Bug: 328326697 (cherry picked from https://android-review.googlesource.com/q/commit:6bab73f7eaf9704347cbf5e7a56463b18c5773f9) Merged-In: I4dfff45015232bbd0a4445e42b13db3ff2d9e87c Change-Id: I4dfff45015232bbd0a4445e42b13db3ff2d9e87c --- uwb/aidl/vts/VtsHalUwbTargetTest.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/uwb/aidl/vts/VtsHalUwbTargetTest.cpp b/uwb/aidl/vts/VtsHalUwbTargetTest.cpp index 81d26ba06b..3b0b60657e 100644 --- a/uwb/aidl/vts/VtsHalUwbTargetTest.cpp +++ b/uwb/aidl/vts/VtsHalUwbTargetTest.cpp @@ -216,5 +216,12 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); ProcessState::self()->setThreadPoolMaxThreadCount(1); ProcessState::self()->startThreadPool(); - return RUN_ALL_TESTS(); + // UWB HAL only allows 1 client, make sure framework + // does not have UWB HAL open before running + std::system("/system/bin/cmd uwb disable-uwb"); + sleep(3); + auto status = RUN_ALL_TESTS(); + sleep(3); + std::system("/system/bin/cmd uwb enable-uwb"); + return status; }