Update tuner default implementation and VTS.
*) DemuxFilterTypeDemuxFilterSubType -> DemuxFilterSubType.
Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: I9069ff91d35b58ee1db4297f888ef241cdfbc135
diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
index e5cee76..13c5a80 100644
--- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
+++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
@@ -146,23 +146,23 @@
type.mainType = static_cast<DemuxFilterMainType>(1 << bit);
switch (type.mainType) {
case DemuxFilterMainType::TS:
- type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+ type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
DemuxTsFilterType::UNDEFINED);
break;
case DemuxFilterMainType::MMTP:
- type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+ type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
DemuxMmtpFilterType::UNDEFINED);
break;
case DemuxFilterMainType::IP:
- type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::ipFilterType>(
+ type.subType.set<DemuxFilterSubType::Tag::ipFilterType>(
DemuxIpFilterType::UNDEFINED);
break;
case DemuxFilterMainType::TLV:
- type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tlvFilterType>(
+ type.subType.set<DemuxFilterSubType::Tag::tlvFilterType>(
DemuxTlvFilterType::UNDEFINED);
break;
case DemuxFilterMainType::ALP:
- type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::alpFilterType>(
+ type.subType.set<DemuxFilterSubType::Tag::alpFilterType>(
DemuxAlpFilterType::UNDEFINED);
break;
default: