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

Commit 2eaf17e7 authored by Henry Fang's avatar Henry Fang
Browse files

Add timeout configure item and set it as 30m 

bug: 182519645
Test: atest VtsHalTvTunerV1_0TargetTest
Change-Id: I82c4617ae4c9c3109b972b22984ca6db706c1e5d
parent 57323715

tv/tuner/1.0/vts/functional/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@ 
    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="VtsHalTvTunerV1_0TargetTest" />

        <option name="native-test-timeout" value="30m" />

    </test>

</configuration>

tv/tuner/1.1/vts/functional/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ 
    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="VtsHalTvTunerV1_1TargetTest" />

        <option name="native-test-timeout" value="30m" />

    </test>

</configuration>

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

+6 −2
Original line number Diff line number Diff line
@@ -306,8 +306,12 @@ 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);

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

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

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ using android::hardware::tv::tuner::V1_0::Result; 
using android::hardware::tv::tuner::V1_1::AvStreamType;

using android::hardware::tv::tuner::V1_1::DemuxFilterEventExt;

using android::hardware::tv::tuner::V1_1::DemuxFilterMonitorEvent;

using android::hardware::tv::tuner::V1_1::DemuxFilterMonitorEventType;

using android::hardware::tv::tuner::V1_1::IFilterCallback;

using android::hardware::tv::tuner::V1_1::ITuner;

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

+1 −1
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ void TunerBroadcastHidlTest::mediaFilterUsingSharedMemoryTest(FilterConfig1_1 fi 
    ASSERT_TRUE(mFilterTests.openFilterInDemux(filterConf.config1_0.type,

                                               filterConf.config1_0.bufferSize));

    ASSERT_TRUE(mFilterTests.getNewlyOpenedFilterId_64bit(filterId));

    ASSERT_TRUE(mFilterTests.getSharedAvMemoryHandle(filterId));

    ASSERT_TRUE(mFilterTests.configFilter(filterConf.config1_0.settings, filterId));

    ASSERT_TRUE(mFilterTests.getSharedAvMemoryHandle(filterId));

    ASSERT_TRUE(mFilterTests.configAvFilterStreamType(filterConf.streamType, filterId));

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

    ASSERT_TRUE(mFilterTests.startFilter(filterId));