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

Commit 8d574441 authored by Henry Fang's avatar Henry Fang Committed by Android (Google) Code Review
Browse files

Merge "remove fmq reference when dvr and filter are closed." into sc-dev

parents d4481aec bc30a4b1

media/jni/tuner/DvrClient.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -314,6 +314,11 @@ Result DvrClient::flush() { 
}

}





Result DvrClient::close() {

Result DvrClient::close() {

    if (mDvrMQEventFlag != NULL) {

        EventFlag::deleteEventFlag(&mDvrMQEventFlag);

    }

    mDvrMQ = NULL;



    if (mTunerDvr != NULL) {

    if (mTunerDvr != NULL) {

        Status s = mTunerDvr->close();

        Status s = mTunerDvr->close();

        mTunerDvr = NULL;

        mTunerDvr = NULL;

media/jni/tuner/FilterClient.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -259,6 +259,11 @@ Result FilterClient::setDataSource(sp<FilterClient> filterClient){ 
}

}





Result FilterClient::close() {

Result FilterClient::close() {

    if (mFilterMQEventFlag != NULL) {

        EventFlag::deleteEventFlag(&mFilterMQEventFlag);

    }

    mFilterMQ = NULL;



    if (mTunerFilter != NULL) {

    if (mTunerFilter != NULL) {

        Status s = mTunerFilter->close();

        Status s = mTunerFilter->close();

        closeAvSharedMemory();

        closeAvSharedMemory();