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

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

Merge "Merge "VTS: fix some logic errors for tuner HAL vts [1/1]" into... 

Merge "Merge "VTS: fix some logic errors for tuner HAL vts [1/1]" into android11-tests-dev am: 0638fc1e" into android12-tests-dev
parents 1b1c772a 3595647d

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

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

        mDvrTests.startPlaybackInputThread(mDvrConfig.playbackInputFile,

                                           mDvrConfig.settings.playback());

        mDvrTests.startDvrPlayback();

        if (!result) {

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

            return failure();
@@ -399,6 +400,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.1/vts/functional/FrontendTests.cpp

+2 −0
Original line number Diff line number Diff line
@@ -443,6 +443,7 @@ AssertionResult FrontendTests::tuneFrontend(FrontendConfig1_1 config, bool testW 
        result &= mDvrTests.getDvrPlaybackMQDescriptor() == success();

        mDvrTests.startPlaybackInputThread(mDvrConfig.playbackInputFile,

                                           mDvrConfig.settings.playback());

        mDvrTests.startDvrPlayback();

        if (!result) {

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

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

    if (mIsSoftwareFe && testWithDemux) {

        mDvrTests.stopPlaybackThread();

        mDvrTests.stopDvrPlayback();

        mDvrTests.closeDvrPlayback();

    }

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