commit e17fcccb1c625e25801c9f8b8fac9baecf0e033c
author Amy Zhang <amyjojo@google.com> Mon Apr 19 16:06:57 2021 -0700
committer Amy Zhang <amyjojo@google.com> Mon Apr 19 16:06:57 2021 -0700
tree 021395b41c0abca53500c39270a760f959bf3463
parent 5c00142fe05d0aa4cbbfde04f0d8f7f5d2d93208

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

diff --git a/media/jni/tuner/FrontendClient.cpp b/media/jni/tuner/FrontendClient.cpp
index f54e266..5d9b12d 100644
--- a/media/jni/tuner/FrontendClient.cpp
+++ b/media/jni/tuner/FrontendClient.cpp
@@ -982,7 +982,7 @@
 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 @@
         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,