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

Commit b7e63bc6 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "Add fix vts fail when configureMonitorEvent" into android14-tests-dev... 

Merge "Add fix vts fail when configureMonitorEvent" into android14-tests-dev am: 7bb2ce97 am: 0804e9f8 am: 2f1b872b am: 80ac05a2

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



Change-Id: I1faf8fa444ee4b34f823046059aa1bc6569971eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4c61931 80ac05a2

tv/tuner/aidl/vts/functional/FilterTests.cpp

+6 −1
Original line number Diff line number Diff line
@@ -305,13 +305,18 @@ AssertionResult FilterTests::configureMonitorEvent(int64_t filterId, int32_t mon 
    ndk::ScopedAStatus status;



    status = mFilters[filterId]->configureMonitorEvent(monitorEventTypes);

    return AssertionResult(status.isOk());

}



AssertionResult FilterTests::testMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes) {

    EXPECT_TRUE(mFilterCallbacks[filterId]) << "Test with getNewlyOpenedFilterId first.";

    if (monitorEventTypes & static_cast<int32_t>(DemuxFilterMonitorEventType::SCRAMBLING_STATUS)) {

        mFilterCallbacks[filterId]->testFilterScramblingEvent();

    }

    if (monitorEventTypes & static_cast<int32_t>(DemuxFilterMonitorEventType::IP_CID_CHANGE)) {

        mFilterCallbacks[filterId]->testFilterIpCidEvent();

    }

    return AssertionResult(status.isOk());

    return AssertionResult(true);

}



AssertionResult FilterTests::startIdTest(int64_t filterId) {

tv/tuner/aidl/vts/functional/FilterTests.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ class FilterTests { 
    AssertionResult configAvFilterStreamType(AvStreamType type, int64_t filterId);

    AssertionResult configIpFilterCid(int32_t ipCid, int64_t filterId);

    AssertionResult configureMonitorEvent(int64_t filterId, int32_t monitorEventTypes);

    AssertionResult testMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes);

    AssertionResult getFilterMQDescriptor(int64_t filterId, bool getMqDesc);

    AssertionResult startFilter(int64_t filterId);

    AssertionResult stopFilter(int64_t filterId);

tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ void TunerFilterAidlTest::configSingleFilterInDemuxTest(FilterConfig filterConf, 
    }

    ASSERT_TRUE(mFilterTests.getFilterMQDescriptor(filterId, filterConf.getMqDesc));

    ASSERT_TRUE(mFilterTests.startFilter(filterId));

    ASSERT_TRUE(mFrontendTests.tuneFrontend(frontendConf, true /*testWithDemux*/));

    if (filterConf.monitorEventTypes > 0) {

        ASSERT_TRUE(mFilterTests.testMonitorEvent(filterId, filterConf.monitorEventTypes));

    }

    ASSERT_TRUE(mFrontendTests.stopTuneFrontend(true /*testWithDemux*/));

    ASSERT_TRUE(mFilterTests.stopFilter(filterId));

    ASSERT_TRUE(mFilterTests.closeFilter(filterId));

    ASSERT_TRUE(mDemuxTests.closeDemux());