commit 4d1d4220c7a26a10633d52360e4583f911cae49a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 14 23:16:52 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 14 23:16:52 2023 +0000
tree b97855e0c6d43841aebf810bce395a28176413d8
parent d410fc0d4214568b05505137eaeea7f27b7547de
parent 6f14da4e93201c69e310b43622b847d117088b52

Snap for 10322758 from 6f14da4e93201c69e310b43622b847d117088b52 to udc-release

Change-Id: I06aa704b5b78a2a3ef082e81894f92a432dad883

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());