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

Commit 9e0575aa authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Use char16_t instead of int in FilterClient to pass 16-bit data defined... 

Merge "Use char16_t instead of int in FilterClient to pass 16-bit data defined in TunerHAL" into sc-dev
parents fae5e140 e17fcccb

media/jni/tuner/FrontendClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ TunerFrontendAtsc3Settings FrontendClient::getAidlAtsc3Settings(const FrontendSe 
TunerFrontendIsdbsSettings FrontendClient::getAidlIsdbsSettings(const FrontendSettings& settings) {

    TunerFrontendIsdbsSettings isdbsSettings{

        .frequency = (int)settings.isdbs().frequency,

        .streamId = (int)settings.isdbs().streamId,

        .streamId = (char16_t)settings.isdbs().streamId,

        .streamIdType = (int)settings.isdbs().streamIdType,

        .modulation = (int)settings.isdbs().modulation,

        .codeRate = (int)settings.isdbs().coderate,
@@ -996,7 +996,7 @@ TunerFrontendIsdbs3Settings FrontendClient::getAidlIsdbs3Settings( 
        const FrontendSettings& settings) {

    TunerFrontendIsdbs3Settings isdbs3Settings{

        .frequency = (int)settings.isdbs3().frequency,

        .streamId = (int)settings.isdbs3().streamId,

        .streamId = (char16_t)settings.isdbs3().streamId,

        .streamIdType = (int)settings.isdbs3().streamIdType,

        .modulation = (int)settings.isdbs3().modulation,

        .codeRate = (int)settings.isdbs3().coderate,