commit 34a479eb1b3d24aefc4d45b6dcdf65ba9157a4a6
author Hongguang <hgchen@google.com> Mon Oct 04 16:14:47 2021 -0700
committer Hongguang Chen <hgchen@google.com> Tue Oct 26 01:25:57 2021 +0000
tree 7652e0b8f0f968659adc7f43fba27e9f5db69b7f
parent 2245fb2c04a31bfdb21ee1fe6b0c500771d28258

Add SharedFilter to tuner service.

Bug: 196124225
Test: atest android.media.tv.tuner.cts on both AIDL and HIDL HAL.
Change-Id: I91b1f9ef09b0bda868b7817be4d946d11629b16c

services/tuner/TunerDemux.cpp

diff --git a/services/tuner/TunerDemux.cpp b/services/tuner/TunerDemux.cpp
index 34efe01..a6f3a2c 100644
--- a/services/tuner/TunerDemux.cpp
+++ b/services/tuner/TunerDemux.cpp
@@ -84,10 +84,12 @@
     }
 
     shared_ptr<IFilter> filter;
-    shared_ptr<IFilterCallback> cb = ::ndk::SharedRefBase::make<TunerFilter::FilterCallback>(in_cb);
+    shared_ptr<TunerFilter::FilterCallback> filterCb =
+            ::ndk::SharedRefBase::make<TunerFilter::FilterCallback>(in_cb);
+    shared_ptr<IFilterCallback> cb = filterCb;
     auto status = mDemux->openFilter(in_type, in_bufferSize, cb, &filter);
     if (status.isOk()) {
-        *_aidl_return = ::ndk::SharedRefBase::make<TunerFilter>(filter, in_type);
+        *_aidl_return = ::ndk::SharedRefBase::make<TunerFilter>(filter, filterCb, in_type);
     }
 
     return status;