From bc30a4b18279045ec0fd9f4e08ba76836ed565aa Mon Sep 17 00:00:00 2001
From: Henry Fang <quxiangfang@google.com>
Date: Mon, 15 Mar 2021 13:27:37 -0700
Subject: [PATCH] remove fmq reference when dvr and filter are closed.

bug: 182546718
Test: manaul
Change-Id: Iea28f07a0800cbab88a1348fa7ae21ac17e1cfd8
---
 media/jni/tuner/DvrClient.cpp    | 5 +++++
 media/jni/tuner/FilterClient.cpp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/media/jni/tuner/DvrClient.cpp b/media/jni/tuner/DvrClient.cpp
index 779318008a9b7..0476216dcbed8 100644
--- a/media/jni/tuner/DvrClient.cpp
+++ b/media/jni/tuner/DvrClient.cpp
@@ -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;
diff --git a/media/jni/tuner/FilterClient.cpp b/media/jni/tuner/FilterClient.cpp
index f31d4651350aa..8846e4d62522d 100644
--- a/media/jni/tuner/FilterClient.cpp
+++ b/media/jni/tuner/FilterClient.cpp
@@ -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();