commit b05f06de559069dfbcd71057128814d552b63b33
author Amy Zhang <amyjojo@google.com> Wed Feb 03 16:08:43 2021 -0800
committer Amy Zhang <amyjojo@google.com> Fri Feb 05 02:01:29 2021 +0000
tree 4a94dcced22fcf6dadf3eff481459b1319fa076c
parent b20005c0f8f0995940547d4663db797e6b798a67

Complete Frontend Status aidl interface and getStatus API in
TunerFrontend

Test: make
Bug: 159067322
Change-Id: Ifc3aea59ae10d22c7f31965f07705f473d4847e7

services/tuner/TunerFrontend.h

diff --git a/services/tuner/TunerFrontend.h b/services/tuner/TunerFrontend.h
index c58a862..729640c 100644
--- a/services/tuner/TunerFrontend.h
+++ b/services/tuner/TunerFrontend.h
@@ -42,11 +42,13 @@
 using ::android::hardware::tv::tuner::V1_0::FrontendScanMessage;
 using ::android::hardware::tv::tuner::V1_0::FrontendScanMessageType;
 using ::android::hardware::tv::tuner::V1_0::FrontendSettings;
+using ::android::hardware::tv::tuner::V1_0::FrontendStatus;
 using ::android::hardware::tv::tuner::V1_0::IFrontend;
 using ::android::hardware::tv::tuner::V1_1::IFrontendCallback;
 using ::android::hardware::tv::tuner::V1_1::FrontendScanMessageExt1_1;
 using ::android::hardware::tv::tuner::V1_1::FrontendScanMessageTypeExt1_1;
 using ::android::hardware::tv::tuner::V1_1::FrontendSettingsExt1_1;
+using ::android::hardware::tv::tuner::V1_1::FrontendStatusExt1_1;
 
 using namespace std;
 
@@ -68,6 +70,8 @@
     Status close() override;
     Status getStatus(const vector<int32_t>& statusTypes,
             vector<TunerFrontendStatus>* _aidl_return) override;
+    Status getStatusExtended_1_1(const vector<int32_t>& statusTypes,
+            vector<TunerFrontendStatus>* _aidl_return) override;
     Status getFrontendId(int* _aidl_return) override;
 
     struct FrontendCallback : public IFrontendCallback {
@@ -89,6 +93,10 @@
     FrontendDvbsCodeRate getDvbsCodeRate(const TunerFrontendDvbsCodeRate& codeRate);
     FrontendSettings getHidlFrontendSettings(const TunerFrontendSettings& aidlSettings);
     FrontendSettingsExt1_1 getHidlFrontendSettingsExt(const TunerFrontendSettings& aidlSettings);
+    void getAidlFrontendStatus(
+            vector<FrontendStatus>& hidlStatus, vector<TunerFrontendStatus>& aidlStatus);
+    void getAidlFrontendStatusExt(
+            vector<FrontendStatusExt1_1>& hidlStatus, vector<TunerFrontendStatus>& aidlStatus);
 
     int mId;
     sp<IFrontend> mFrontend;