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

Commit 88b7c10c authored by Treehugger Robot's avatar Treehugger Robot Committed by Henry Fang
Browse files

[conflict] Merge "vts: fix some tunerhal vts fail without frontend device"... 

[conflict] Merge "vts: fix some tunerhal vts fail without frontend device" into android11-tests-dev am: 6807799a

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



Change-Id: I5993b88b7d0831c9b95adfc50ebe501215f40498
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbecb456 6807799a

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

100755 → 100644
+10 −7
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ AssertionResult FrontendTests::closeFrontend() { 


void FrontendTests::getFrontendIdByType(FrontendType feType, uint32_t& feId) {

    ASSERT_TRUE(getFrontendIds());

    if (mFeIds.size() > 0) {

        for (size_t i = 0; i < mFeIds.size(); i++) {

            ASSERT_TRUE(getFrontendInfo(mFeIds[i]));

            if (mFrontendInfo.type != feType) {
@@ -425,8 +426,10 @@ void FrontendTests::getFrontendIdByType(FrontendType feType, uint32_t& feId) { 
            feId = mFeIds[i];

            return;

        }

    } else {

        feId = INVALID_ID;

    }

}



void FrontendTests::tuneTest(FrontendConfig frontendConf) {

    uint32_t feId;