Fix Filter/DVR MQ leak

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

media/jni/tuner/DvrClient.cpp

@@ -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;
     }
-    mDvrMQ = nullptr;
 
     if (mTunerDvr != nullptr) {
         Status s = mTunerDvr->close();

media/jni/tuner/FilterClient.cpp

@@ -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;
     }
-    mFilterMQEventFlag = nullptr;
-    mFilterMQ = nullptr;
 
     if (mTunerFilter != nullptr) {
         Status s = mTunerFilter->close();