commit ce1e30d578e43a0016017bb1ea162acb715525f8
author Hongguang <hgchen@google.com> Mon Aug 02 21:55:44 2021 -0700
committer Hongguang <hgchen@google.com> Tue Aug 03 08:57:32 2021 -0700
tree 0cfe6187ee90e4f22a6f3bcd590da83fe38c3853
parent e24a0dce53f96b6f369cb851337cec2807c9440d

Update tuner default implementation and VTS.

*) DemuxFilterTypeDemuxFilterSubType -> DemuxFilterSubType.

Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: I9069ff91d35b58ee1db4297f888ef241cdfbc135

tv/tuner/aidl/vts/functional/DescramblerTests.cpp

diff --git a/tv/tuner/aidl/vts/functional/DescramblerTests.cpp b/tv/tuner/aidl/vts/functional/DescramblerTests.cpp
index e0ee391..157fa04 100644
--- a/tv/tuner/aidl/vts/functional/DescramblerTests.cpp
+++ b/tv/tuner/aidl/vts/functional/DescramblerTests.cpp
@@ -175,9 +175,9 @@
                                                                 DemuxPid& pid) {
     switch (type.mainType) {
         case DemuxFilterMainType::TS:
-            if (type.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>() ==
+            if (type.subType.get<DemuxFilterSubType::Tag::tsFilterType>() ==
                         DemuxTsFilterType::AUDIO ||
-                type.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>() ==
+                type.subType.get<DemuxFilterSubType::Tag::tsFilterType>() ==
                         DemuxTsFilterType::VIDEO) {
                 pid.set<DemuxPid::Tag::tPid>(settings.get<DemuxFilterSettings::Tag::ts>().tpid);
             } else {
@@ -186,9 +186,9 @@
             }
             break;
         case DemuxFilterMainType::MMTP:
-            if (type.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>() ==
+            if (type.subType.get<DemuxFilterSubType::Tag::mmtpFilterType>() ==
                         DemuxMmtpFilterType::AUDIO ||
-                type.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>() ==
+                type.subType.get<DemuxFilterSubType::Tag::mmtpFilterType>() ==
                         DemuxMmtpFilterType::VIDEO) {
                 pid.set<DemuxPid::Tag::mmtpPid>(
                         settings.get<DemuxFilterSettings::Tag::mmtp>().mmtpPid);