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

Commit d9b167df authored by mike liao's avatar mike liao Committed by Automerger Merge Worker
Browse files

Add fix vts fail when configureMonitorEvent am: b79cbf50 am: d8baeb39 am:... 

Add fix vts fail when configureMonitorEvent am: b79cbf50 am: d8baeb39 am: 1b000d13 am: 16f79865

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



Change-Id: I447ba1a504bf63009664ace5437cb8014978b751
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62ad051d 16f79865

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

+11 −6
Original line number Diff line number Diff line
@@ -311,17 +311,22 @@ AssertionResult FilterTests::configureMonitorEvent(uint64_t filterId, uint32_t m 
            android::hardware::tv::tuner::V1_1::IFilter::castFrom(mFilters[filterId]);

    if (filter_v1_1 != NULL) {

        status = filter_v1_1->configureMonitorEvent(monitorEventTypes);

    } else {

        ALOGW("[vts] Can't cast IFilter into v1_1.");

        return failure();

    }

    return AssertionResult(status == Result::SUCCESS);

}



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

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

    if (monitorEventTypes & DemuxFilterMonitorEventType::SCRAMBLING_STATUS) {

        mFilterCallbacks[filterId]->testFilterScramblingEvent();

    }

    if (monitorEventTypes & DemuxFilterMonitorEventType::IP_CID_CHANGE) {

        mFilterCallbacks[filterId]->testFilterIpCidEvent();

    }

    } else {

        ALOGW("[vts] Can't cast IFilter into v1_1.");

        return failure();

    }

    return AssertionResult(status == Result::SUCCESS);

    return AssertionResult(true);

}



AssertionResult FilterTests::startIdTest(uint64_t filterId) {

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

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

    AssertionResult configIpFilterCid(uint32_t ipCid, uint64_t filterId);

    AssertionResult configureMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes);

    AssertionResult testMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes);

    AssertionResult getFilterMQDescriptor(uint64_t filterId, bool getMqDesc);

    AssertionResult startFilter(uint64_t filterId);

    AssertionResult stopFilter(uint64_t filterId);

tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.cpp

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ void TunerFilterHidlTest::configSingleFilterInDemuxTest(FilterConfig1_1 filterCo 
    }

    ASSERT_TRUE(mFilterTests.getFilterMQDescriptor(filterId, filterConf.config1_0.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());