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

Commit f5cea15f authored by David Zhao's avatar David Zhao
Browse files

Ensure tuner components close on destruct 

Bug: 254234231
Test: Manually on cuttlefish with logging of destruction and closing of
Tuner components
Change-Id: I22f7eefa429b1a9d239c34eb668b156c9d81dc3f

Change-Id: I5dad4ffef4efbbb98660a161c59518a038d7bfaf
parent cc7c8625

services/tuner/TunerDemux.cpp

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

}





TunerDemux::~TunerDemux() {

TunerDemux::~TunerDemux() {

    close();

    mDemux = nullptr;

    mDemux = nullptr;

    mTunerService = nullptr;

    mTunerService = nullptr;

}

}

services/tuner/TunerDescrambler.cpp

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

}





TunerDescrambler::~TunerDescrambler() {

TunerDescrambler::~TunerDescrambler() {

    close();

    mDescrambler = nullptr;

    mDescrambler = nullptr;

}

}

services/tuner/TunerDvr.cpp

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

}





TunerDvr::~TunerDvr() {

TunerDvr::~TunerDvr() {

    close();

    mDvr = nullptr;

    mDvr = nullptr;

}

}

services/tuner/TunerFilter.cpp

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

        mTunerService(tuner) {}





TunerFilter::~TunerFilter() {

TunerFilter::~TunerFilter() {

    close();

    freeSharedFilterToken("");

    freeSharedFilterToken("");



    {

    {

        Mutex::Autolock _l(mLock);

        Mutex::Autolock _l(mLock);

        mFilter = nullptr;

        mFilter = nullptr;

services/tuner/TunerFrontend.cpp

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

}





TunerFrontend::~TunerFrontend() {

TunerFrontend::~TunerFrontend() {

    close();

    mFrontend = nullptr;

    mFrontend = nullptr;

    mId = -1;

    mId = -1;

}

}