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

Commit 0f633885 authored Nov 04, 2021 by Gareth Fenn Committed by Hongguang Nov 08, 2021

Fix Filter/DVR MQ leak



Test: BCM TunerHAL app
Bug: 205549285
Signed-off-by: Pierre Couillaud <pierre.couillaud@broadcom.com>
Change-Id: Ic8907b7e464ddf031b74d60ffd706362447927d9

parent b58e05f1

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();