Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 339e4bc7 authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

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

Merge "Avoid skipping test if it's supported." into udc-dev am: 6f14da4e am: 6e13aa44 am: 684bc2e3

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



Change-Id: I6d6f88bfb1118d8471198fc54c99599219623524
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf70fce3 684bc2e3

power/aidl/vts/VtsHalPowerTargetTest.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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());