commit 6f14da4e93201c69e310b43622b847d117088b52
author Peiyong Lin <lpy@google.com> Wed Jun 14 19:49:43 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 14 19:49:43 2023 +0000
tree b97855e0c6d43841aebf810bce395a28176413d8
parent 5df702513f430c7f0d3670a0a7d224b68cf96100
parent 9fb755319bcca29be1470135c86da05290af3c29

Merge "Avoid skipping test if it's supported." into udc-dev

power/aidl/vts/VtsHalPowerTargetTest.cpp

diff --git a/power/aidl/vts/VtsHalPowerTargetTest.cpp b/power/aidl/vts/VtsHalPowerTargetTest.cpp
index d14e7b6..c2216f8 100644
--- a/power/aidl/vts/VtsHalPowerTargetTest.cpp
+++ b/power/aidl/vts/VtsHalPowerTargetTest.cpp
@@ -255,11 +255,10 @@
     }
     ASSERT_TRUE(status.isOk());
 
-    if (mApiLevel < kCompatibilityMatrix8ApiLevel) {
+    status = session->setThreads(kEmptyTids);
+    if (mApiLevel < kCompatibilityMatrix8ApiLevel && isUnknownOrUnsupported(status)) {
         GTEST_SKIP() << "DEVICE not launching with Android 14 and beyond.";
     }
-
-    status = session->setThreads(kEmptyTids);
     ASSERT_FALSE(status.isOk());
     ASSERT_EQ(EX_ILLEGAL_ARGUMENT, status.getExceptionCode());