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

Commit e17fcccb authored by Amy Zhang's avatar Amy Zhang
Browse files

Use char16_t instead of int in FilterClient to pass 16-bit data defined in TunerHAL 

char is char16_t in cpp backend when defined in AIDL interface.
Which matches uint16_t type defined in the Tuner HAL.
See: https://source.android.com/devices/architecture/aidl/aidl-backends#types

Test: make
Bug: 185627837
Change-Id: I287197c34ef5a892c05df3cb9226006fd2cf88dd
parent 5c00142f

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,