commit c02e80010340f4ad1ba1208f2885b9722393efee
author Jooyung Han <jooyung@google.com> Thu Mar 17 01:51:52 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 17 01:51:52 2022 +0000
tree 0acdf254b69b6a819c127b2488fcec1d0e563d8e
parent 4cb91e824b7af50c0759c4da63509f8eefcf15ba
parent 20e893dd094da42c289ac5a4fa1b7b6afe7a6ec8

Merge "Fix TunerFilterSetting union usage" am: 4b63204bec am: 20e893dd09

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

Change-Id: I4b9ab3f8d847851beb7f599af60d8da53163d9bb

services/tuner/TunerFilter.cpp

diff --git a/services/tuner/TunerFilter.cpp b/services/tuner/TunerFilter.cpp
index 039fd31..ca82526 100644
--- a/services/tuner/TunerFilter.cpp
+++ b/services/tuner/TunerFilter.cpp
@@ -301,7 +301,7 @@
             break;
         }
         case TunerFilterSettings::isPassthrough: {
-            ip.filterSettings.bPassthrough(tunerSettings.isPassthrough);
+            ip.filterSettings.bPassthrough(tunerSettings.get<TunerFilterSettings::isPassthrough>());
             break;
         }
         default: {
@@ -345,7 +345,8 @@
             break;
         }
         case TunerFilterSettings::isPassthrough: {
-            tlv.filterSettings.bPassthrough(tunerSettings.isPassthrough);
+            tlv.filterSettings.bPassthrough(
+                    tunerSettings.get<TunerFilterSettings::isPassthrough>());
             break;
         }
         default: {