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

Commit 4a491a1e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix Filter/DVR MQ leak"

parents 8e9b12cd 0f633885

media/jni/tuner/DvrClient.cpp

+5 −1
Original line number Diff line number Diff line
@@ -278,8 +278,12 @@ Result DvrClient::flush() { 
Result DvrClient::close() {

    if (mDvrMQEventFlag != nullptr) {

        EventFlag::deleteEventFlag(&mDvrMQEventFlag);

        mDvrMQEventFlag = nullptr;

    }

    if (mDvrMQ != nullptr) {

        delete mDvrMQ;

        mDvrMQ = nullptr;

    }



    if (mTunerDvr != nullptr) {

        Status s = mTunerDvr->close();

media/jni/tuner/FilterClient.cpp

+6 −3
Original line number Diff line number Diff line
@@ -177,11 +177,14 @@ Result FilterClient::setDataSource(sp<FilterClient> filterClient){ 
}



Result FilterClient::close() {

    if (mFilterMQEventFlag) {

    if (mFilterMQEventFlag != nullptr) {

        EventFlag::deleteEventFlag(&mFilterMQEventFlag);

    }

        mFilterMQEventFlag = nullptr;

    }

    if (mFilterMQ != nullptr) {

        delete mFilterMQ;

        mFilterMQ = nullptr;

    }



    if (mTunerFilter != nullptr) {

        Status s = mTunerFilter->close();