From b2ce69539e3695d82f80302ccd7c5032c925a5ce Mon Sep 17 00:00:00 2001
From: Amy Zhang <amyjojo@google.com>
Date: Mon, 25 Jan 2021 14:50:37 -0800
Subject: [PATCH] Connect onFilterEvent of TunerFilterCallback in FilterClient

Note that the implementation is still ongoing.
The CL is to unblock the TunerFilter server side code merging

Test: make libmedia_tv_tuner
Bug: 174095851
Change-Id: I93dc1129080b61c26dd254e44b2c98f3a3b387fd
---
 media/jni/tuner/FilterClient.cpp | 5 +++++
 media/jni/tuner/FilterClient.h   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/media/jni/tuner/FilterClient.cpp b/media/jni/tuner/FilterClient.cpp
index f26560b44d433..bcef0a2f44137 100644
--- a/media/jni/tuner/FilterClient.cpp
+++ b/media/jni/tuner/FilterClient.cpp
@@ -269,6 +269,11 @@ Status TunerFilterCallback::onFilterStatus(int status) {
     return Status::fromServiceSpecificError(static_cast<int32_t>(Result::INVALID_STATE));
 }
 
+Status TunerFilterCallback::onFilterEvent(vector<TunerFilterEvent>* /*filterEvent*/) {
+    // TODO: complete onFilterEvent
+    return Status::ok();
+}
+
 /////////////// FilterClient Helper Methods ///////////////////////
 
 Result FilterClient::getFilterMq() {
diff --git a/media/jni/tuner/FilterClient.h b/media/jni/tuner/FilterClient.h
index 57efcd3972b57..6af33f7627016 100644
--- a/media/jni/tuner/FilterClient.h
+++ b/media/jni/tuner/FilterClient.h
@@ -19,6 +19,7 @@
 
 #include <aidl/android/media/tv/tuner/ITunerFilter.h>
 #include <aidl/android/media/tv/tuner/BnTunerFilterCallback.h>
+#include <aidl/android/media/tv/tuner/TunerFilterEvent.h>
 #include <android/hardware/tv/tuner/1.1/IFilter.h>
 #include <android/hardware/tv/tuner/1.1/IFilterCallback.h>
 #include <android/hardware/tv/tuner/1.1/types.h>
@@ -30,6 +31,7 @@
 using Status = ::ndk::ScopedAStatus;
 using ::aidl::android::media::tv::tuner::BnTunerFilterCallback;
 using ::aidl::android::media::tv::tuner::ITunerFilter;
+using ::aidl::android::media::tv::tuner::TunerFilterEvent;
 
 using ::android::hardware::EventFlag;
 using ::android::hardware::MessageQueue;
@@ -61,6 +63,7 @@ public:
     TunerFilterCallback(sp<FilterClientCallback> filterClientCallback);
     // TODO: complete TunerFilterCallback
     Status onFilterStatus(int status);
+    Status onFilterEvent(vector<TunerFilterEvent>* filterEvent);
 
 private:
     sp<FilterClientCallback> mFilterClientCallback;