summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeiyong Lin <lpy@google.com>2023-06-14 19:49:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-06-14 19:49:43 +0000
commit6f14da4e93201c69e310b43622b847d117088b52 (patch)
treeb97855e0c6d43841aebf810bce395a28176413d8
parent5df702513f430c7f0d3670a0a7d224b68cf96100 (diff)
parent9fb755319bcca29be1470135c86da05290af3c29 (diff)
Merge "Avoid skipping test if it's supported." into udc-dev
-rw-r--r--power/aidl/vts/VtsHalPowerTargetTest.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/power/aidl/vts/VtsHalPowerTargetTest.cpp b/power/aidl/vts/VtsHalPowerTargetTest.cpp
index d14e7b61a6..c2216f8cf6 100644
--- a/power/aidl/vts/VtsHalPowerTargetTest.cpp
+++ b/power/aidl/vts/VtsHalPowerTargetTest.cpp
@@ -255,11 +255,10 @@ TEST_P(PowerAidl, setThreads) {
}
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());