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

Commit 957e044b authored by Amy Zhang's avatar Amy Zhang
Browse files

Remove unused local callback copy in TunerService 

Test: make
Bug: 180948146
Change-Id: Ie18a0b08394242e49f58b1c697ebdb930b38e9dc
parent 23730120

services/tuner/TunerDemux.cpp

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ Status TunerDemux::openFilter( 
        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }



    *_aidl_return = ::ndk::SharedRefBase::make<TunerFilter>(filterSp, cbSp, type, subType);

    *_aidl_return = ::ndk::SharedRefBase::make<TunerFilter>(filterSp, type, subType);

    return Status::ok();

}

services/tuner/TunerFilter.cpp

+1 −3
Original line number Diff line number Diff line
@@ -39,10 +39,9 @@ namespace android { 
using namespace std;



TunerFilter::TunerFilter(

        sp<IFilter> filter, sp<IFilterCallback> callback, int mainType, int subType) {

        sp<IFilter> filter, int mainType, int subType) {

    mFilter = filter;

    mFilter_1_1 = ::android::hardware::tv::tuner::V1_1::IFilter::castFrom(filter);

    mFilterCallback = callback;

    mMainType = mainType;

    mSubType = subType;

}
@@ -50,7 +49,6 @@ TunerFilter::TunerFilter( 
TunerFilter::~TunerFilter() {

    mFilter = nullptr;

    mFilter_1_1 = nullptr;

    mFilterCallback = nullptr;

}



Status TunerFilter::getQueueDesc(AidlMQDesc* _aidl_return) {

services/tuner/TunerFilter.h

+1 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ const static int IP_V6_LENGTH = 16; 
class TunerFilter : public BnTunerFilter {



public:

    TunerFilter(sp<IFilter> filter, sp<IFilterCallback> callback, int mainType, int subTyp);

    TunerFilter(sp<IFilter> filter, int mainType, int subTyp);

    virtual ~TunerFilter();

    Status getId(int32_t* _aidl_return) override;

    Status getId64Bit(int64_t* _aidl_return) override;
@@ -181,7 +181,6 @@ private: 


    sp<IFilter> mFilter;

    sp<::android::hardware::tv::tuner::V1_1::IFilter> mFilter_1_1;

    sp<IFilterCallback> mFilterCallback;

    int32_t mId;

    int64_t mId64Bit;

    int mMainType;