commit 80cb96048b6c07666e508137201b4f2a03a6da34
author Amy Zhang <amyjojo@google.com> Wed Jul 15 13:06:39 2020 -0700
committer Amy Zhang <amyjojo@google.com> Tue Jul 21 22:43:58 2020 -0700
tree 7d3eac0f2478d253166a555dc0ad56f4f631062f
parent 45cc57ac67adc06d86ac6ae1b2c56a6ff27de007

Add a getAvSyncHwId_64bit in Tuner HAL 1.1 to support 64 bit hw sync id

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: b/159058358
Change-Id: I3e58beaf4f61b27acce71a530e42293c4a87b181

tv/tuner/1.1/default/Tuner.h

diff --git a/tv/tuner/1.1/default/Tuner.h b/tv/tuner/1.1/default/Tuner.h
index 9463278..3b1574b 100644
--- a/tv/tuner/1.1/default/Tuner.h
+++ b/tv/tuner/1.1/default/Tuner.h
@@ -68,14 +68,16 @@
 
     void frontendStartTune(uint32_t frontendId);
     void frontendStopTune(uint32_t frontendId);
+    void removeDemux(uint32_t demuxId);
+    void removeFrontend(uint32_t frontendId);
 
   private:
     virtual ~Tuner();
     // Static mFrontends array to maintain local frontends information
-    vector<sp<Frontend>> mFrontends;
-    vector<FrontendInfo::FrontendCapabilities> mFrontendCaps;
-    std::map<uint32_t, uint32_t> mFrontendToDemux;
-    std::map<uint32_t, sp<Demux>> mDemuxes;
+    map<uint32_t, sp<Frontend>> mFrontends;
+    map<uint32_t, FrontendInfo::FrontendCapabilities> mFrontendCaps;
+    map<uint32_t, uint32_t> mFrontendToDemux;
+    map<uint32_t, sp<Demux>> mDemuxes;
     // To maintain how many Frontends we have
     int mFrontendSize;
     // The last used demux id. Initial value is -1.