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

Commit 13989442 authored by Rocky Fang's avatar Rocky Fang Committed by Automerger Merge Worker
Browse files

Merge "Ignore NanSessionStateChange test for old HAL" into udc-dev am:... 

Merge "Ignore NanSessionStateChange test for old HAL" into udc-dev am: 25d40250 am: cddd4dd6 am: 067c7d09

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



Change-Id: I5aea5e575f1438a0467627fe5f256e64aba9009d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fde51314 067c7d09

contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp

+9 −3
Original line number Diff line number Diff line
@@ -385,10 +385,16 @@ TEST_P(ContextHubAidl, TestInvalidHostConnection) { 
TEST_P(ContextHubAidl, TestNanSessionStateChange) {

    NanSessionStateUpdate update;

    update.state = true;

    ASSERT_TRUE(contextHub->onNanSessionStateChanged(update).isOk());

    Status status = contextHub->onNanSessionStateChanged(update);

    if (status.exceptionCode() == Status::EX_UNSUPPORTED_OPERATION ||

        status.transactionError() == android::UNKNOWN_TRANSACTION) {

        GTEST_SKIP() << "Not supported -> old API; or not implemented";

    } else {

        ASSERT_TRUE(status.isOk());

        update.state = false;

        ASSERT_TRUE(contextHub->onNanSessionStateChanged(update).isOk());

    }

}



std::string PrintGeneratedTest(const testing::TestParamInfo<ContextHubAidl::ParamType>& info) {

    return std::string("CONTEXT_HUB_ID_") + std::to_string(std::get<1>(info.param));