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

Commit e44d3621 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13879275

Change-Id: I5e0c9f1a7f8c938c6f98615257ca9c9edb848bdf
parents f7957561 8d574441

media/jni/tuner/DvrClient.cpp

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



Result DvrClient::close() {

    if (mDvrMQEventFlag != NULL) {

        EventFlag::deleteEventFlag(&mDvrMQEventFlag);

    }

    mDvrMQ = NULL;



    if (mTunerDvr != NULL) {

        Status s = mTunerDvr->close();

        mTunerDvr = NULL;

media/jni/tuner/FilterClient.cpp

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



Result FilterClient::close() {

    if (mFilterMQEventFlag != NULL) {

        EventFlag::deleteEventFlag(&mFilterMQEventFlag);

    }

    mFilterMQ = NULL;



    if (mTunerFilter != NULL) {

        Status s = mTunerFilter->close();

        closeAvSharedMemory();