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

Commit d8a70b00 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "Fix tunerhal vts feId uninitialized on getFrontendIdByType" into... 

Merge "Fix tunerhal vts feId uninitialized on getFrontendIdByType" into android11-tests-dev am: 40087f64

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



Change-Id: I5984bcb9f4ba77cdd3deba87beaea43aaedd3a72
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f3ac426 40087f64

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

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


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

    ASSERT_TRUE(getFrontendIds());

    if (mFeIds.size() > 0) {

    feId = INVALID_ID;

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

        ASSERT_TRUE(getFrontendInfo(mFeIds[i]));

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

        return;

    }

    } else {

        feId = INVALID_ID;

    }

}



void FrontendTests::tuneTest(FrontendConfig frontendConf) {