From b9e197b02809a91331ec3acf4aaf29e1670724b2 Mon Sep 17 00:00:00 2001
From: Henry Fang <quxiangfang@google.com>
Date: Fri, 20 Jan 2023 01:47:59 +0000
Subject: [PATCH] still release avhandle even the filter client is already
 released. bug:266043686 Change-Id: I8e7d0a6a807f128079bd7500282138197a7ede23
 test:manual

---
 media/jni/android_media_tv_Tuner.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index a73725bad425f..1a41bc29deed2 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -490,9 +490,11 @@ MediaEvent::~MediaEvent() {
 }
 
 void MediaEvent::finalize() {
-    if (mAvHandleRefCnt == 0 && mFilterClient != nullptr) {
-        mFilterClient->releaseAvHandle(
-                mAvHandle, mDataIdRefCnt == 0 ? mDataId : 0);
+    if (mAvHandleRefCnt == 0) {
+        if (mFilterClient != nullptr) {
+            mFilterClient->releaseAvHandle(
+                    mAvHandle, mDataIdRefCnt == 0 ? mDataId : 0);
+        }
         native_handle_close(mAvHandle);
     }
 }