| commit | f630be3b07128ebf3b869104bad90d949617980c | [log] [tgz] |
|---|---|---|
| author | Peiyong Lin <lpy@google.com> | Wed Jun 14 20:25:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 14 20:25:08 2023 +0000 |
| tree | b97855e0c6d43841aebf810bce395a28176413d8 | |
| parent | 96003ab7f3a3775cab9cca311a062ffb631c42a4 [diff] | |
| parent | 6f14da4e93201c69e310b43622b847d117088b52 [diff] |
Merge "Avoid skipping test if it's supported." into udc-dev am: 6f14da4e93 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23696544 Change-Id: Ie27ef68db58163b02dc7a64ac9abc3abfbd61a25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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());