Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ab2c980 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Connect onFilterEvent of TunerFilterCallback in FilterClient"

parents e8b91349 b2ce6953

media/jni/tuner/FilterClient.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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() {

media/jni/tuner/FilterClient.h

+3 −0
Original line number Diff line number Diff line
@@ -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;