From e17fcccb1c625e25801c9f8b8fac9baecf0e033c Mon Sep 17 00:00:00 2001 From: Amy Zhang Date: Mon, 19 Apr 2021 16:06:57 -0700 Subject: [PATCH] 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 --- media/jni/tuner/FrontendClient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/jni/tuner/FrontendClient.cpp b/media/jni/tuner/FrontendClient.cpp index f54e2663843c9..5d9b12d59482b 100644 --- a/media/jni/tuner/FrontendClient.cpp +++ b/media/jni/tuner/FrontendClient.cpp @@ -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,