Merge "Avoid skipping test if it's supported." into udc-dev am: 6f14da4e93 am: f630be3b07

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23696544

Change-Id: I64cc1cf462b196b3a96b1b90f9d94bd5b06409c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peiyong Lin
2023-06-14 21:12:17 +00:00
committed by Automerger Merge Worker

View File

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