commit bc30a4b18279045ec0fd9f4e08ba76836ed565aa
author Henry Fang <quxiangfang@google.com> Mon Mar 15 13:27:37 2021 -0700
committer Henry Fang <quxiangfang@google.com> Tue Mar 16 04:22:51 2021 +0000
tree e1c2a2c21706e1a605068b1b88b13b09088bfca1
parent c7a5fdd81c2d6da97bd98b46be7451f5f062f2a5

remove fmq reference when dvr and filter are closed.

bug: 182546718
Test: manaul
Change-Id: Iea28f07a0800cbab88a1348fa7ae21ac17e1cfd8

media/jni/tuner/DvrClient.cpp

diff --git a/media/jni/tuner/DvrClient.cpp b/media/jni/tuner/DvrClient.cpp
index 7793180..0476216 100644
--- a/media/jni/tuner/DvrClient.cpp
+++ b/media/jni/tuner/DvrClient.cpp
@@ -314,6 +314,11 @@
 }
 
 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

diff --git a/media/jni/tuner/FilterClient.cpp b/media/jni/tuner/FilterClient.cpp
index f31d465..8846e4d6 100644
--- a/media/jni/tuner/FilterClient.cpp
+++ b/media/jni/tuner/FilterClient.cpp
@@ -259,6 +259,11 @@
 }
 
 Result FilterClient::close() {
+    if (mFilterMQEventFlag != NULL) {
+        EventFlag::deleteEventFlag(&mFilterMQEventFlag);
+    }
+    mFilterMQ = NULL;
+
     if (mTunerFilter != NULL) {
         Status s = mTunerFilter->close();
         closeAvSharedMemory();