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

Commit c02e8001 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Fix TunerFilterSetting union usage" am: 4b63204b am: 20e893dd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2026184

Change-Id: I4b9ab3f8d847851beb7f599af60d8da53163d9bb
parents 4cb91e82 20e893dd

services/tuner/TunerFilter.cpp

+3 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ void TunerFilter::getHidlIpSettings( 
            break;

        }

        case TunerFilterSettings::isPassthrough: {

            ip.filterSettings.bPassthrough(tunerSettings.isPassthrough);

            ip.filterSettings.bPassthrough(tunerSettings.get<TunerFilterSettings::isPassthrough>());

            break;

        }

        default: {
@@ -345,7 +345,8 @@ void TunerFilter::getHidlTlvSettings( 
            break;

        }

        case TunerFilterSettings::isPassthrough: {

            tlv.filterSettings.bPassthrough(tunerSettings.isPassthrough);

            tlv.filterSettings.bPassthrough(

                    tunerSettings.get<TunerFilterSettings::isPassthrough>());

            break;

        }

        default: {