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

Commit 0638fc1e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "VTS: fix some logic errors for tuner HAL vts [1/1]" into android11-tests-dev

parents 5779890f 663ca1ab

tv/tuner/1.0/vts/functional/FrontendTests.cpp

100755 → 100644
+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ AssertionResult FrontendTests::tuneFrontend(FrontendConfig config, bool testWith 
        result &= mDvrTests.getDvrPlaybackMQDescriptor() == success();

        mDvrTests.startPlaybackInputThread(dvrConfig.playbackInputFile,

                                           dvrConfig.settings.playback());

        mDvrTests.startDvrPlayback();

        if (!result) {

            ALOGW("[vts] Software frontend dvr configure failed.");

            return failure();
@@ -400,6 +401,7 @@ AssertionResult FrontendTests::stopTuneFrontend(bool testWithDemux) { 
    status = mFrontend->stopTune();

    if (mIsSoftwareFe && testWithDemux) {

        mDvrTests.stopPlaybackThread();

        mDvrTests.stopDvrPlayback();

        mDvrTests.closeDvrPlayback();

    }

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

tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int defaultScanFrontend = SCAN_DVBT; 
/** Configuration array for the frontend tune test */

inline void initFrontendConfig() {

    FrontendDvbtSettings dvbtSettings{

            .frequency = 578000,

            .frequency = 578000000,

            .transmissionMode = FrontendDvbtTransmissionMode::AUTO,

            .bandwidth = FrontendDvbtBandwidth::BANDWIDTH_8MHZ,

            .constellation = FrontendDvbtConstellation::AUTO,