Merge "still release avhandle even the filter client is already released. bug:266043686 Change-Id: I8e7d0a6a807f128079bd7500282138197a7ede23 test:manual"

2023-01-20 03:55:04 +00:00
parent 5b1e7591b3 b9e197b028
commit 6bafc235b6
1 changed files with 5 additions and 3 deletions
--- 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);
    }
 }