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

Commit bc9ba5b1 authored by David Zhao's avatar David Zhao Committed by Android (Google) Code Review
Browse files

Merge "Ensure tuner components close on destruct"

parents a32e1783 f5cea15f

services/tuner/TunerDemux.cpp

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ TunerDemux::TunerDemux(const shared_ptr<IDemux> demux, const int id, 
}



TunerDemux::~TunerDemux() {

    close();

    mDemux = nullptr;

    mTunerService = nullptr;

}

services/tuner/TunerDescrambler.cpp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ TunerDescrambler::TunerDescrambler(shared_ptr<IDescrambler> descrambler) { 
}



TunerDescrambler::~TunerDescrambler() {

    close();

    mDescrambler = nullptr;

}

services/tuner/TunerDvr.cpp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ TunerDvr::TunerDvr(shared_ptr<IDvr> dvr, DvrType type) { 
}



TunerDvr::~TunerDvr() {

    close();

    mDvr = nullptr;

}

services/tuner/TunerFilter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ TunerFilter::TunerFilter(const shared_ptr<IFilter> filter, const shared_ptr<Filt 
        mTunerService(tuner) {}



TunerFilter::~TunerFilter() {

    close();

    freeSharedFilterToken("");



    {

        Mutex::Autolock _l(mLock);

        mFilter = nullptr;

services/tuner/TunerFrontend.cpp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ TunerFrontend::TunerFrontend(shared_ptr<IFrontend> frontend, int id) { 
}



TunerFrontend::~TunerFrontend() {

    close();

    mFrontend = nullptr;

    mId = -1;

}