commit c84fe12f1ddf6855453b37019271a49c7bb2dac7
author shubang <shubang@google.com> Wed Jun 17 11:00:11 2020 -0700
committer shubang <shubang@google.com> Wed Jun 17 14:57:10 2020 -0700
tree 061977a388820b5cf65afa10936619b39f25d373
parent 892d269b65e8e840231af6f84e7c8934a17eee46

Fix MediaEvent release issue

Bug: 158876323
Test: make;
Change-Id: Idedf41620b5a32ca552836d00b1db78adcfd1a7f

media/java/android/media/tv/tuner/filter/MediaEvent.java

diff --git a/media/java/android/media/tv/tuner/filter/MediaEvent.java b/media/java/android/media/tv/tuner/filter/MediaEvent.java
index af63070..57a04fd 100644
--- a/media/java/android/media/tv/tuner/filter/MediaEvent.java
+++ b/media/java/android/media/tv/tuner/filter/MediaEvent.java
@@ -29,6 +29,7 @@
 @SystemApi
 public class MediaEvent extends FilterEvent {
     private long mNativeContext;
+    private boolean mReleased = false;
     private final Object mLock = new Object();
 
     private native Long nativeGetAudioHandle();
@@ -181,7 +182,21 @@
      */
     @Override
     protected void finalize() {
-        nativeFinalize();
-        mNativeContext = 0;
+        release();
+    }
+
+    /**
+     * Releases the MediaEvent object.
+     * @hide
+     */
+    public void release() {
+        synchronized (mLock) {
+            if (mReleased) {
+                return;
+            }
+            nativeFinalize();
+            mNativeContext = 0;
+            mReleased = true;
+        }
     }
 }

media/jni/android_media_tv_Tuner.cpp

diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index 7e72140..e8f18a5 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -314,8 +314,9 @@
     if (mIonHandle != NULL) {
         delete mIonHandle;
     }
-    if (mC2Buffer != NULL) {
-        mC2Buffer->unregisterOnDestroyNotify(&DestroyCallback, this);
+    std::shared_ptr<C2Buffer> pC2Buffer = mC2Buffer.lock();
+    if (pC2Buffer != NULL) {
+        pC2Buffer->unregisterOnDestroyNotify(&DestroyCallback, this);
     }
 }
 
@@ -340,15 +341,17 @@
     JNIEnv *env = AndroidRuntime::getJNIEnv();
     std::unique_ptr<JMediaCodecLinearBlock> context{new JMediaCodecLinearBlock};
     context->mBlock = block;
-    mC2Buffer = context->toC2Buffer(0, mDataLength);
+    std::shared_ptr<C2Buffer> pC2Buffer = context->toC2Buffer(0, mDataLength);
+    context->mBuffer = pC2Buffer;
+    mC2Buffer = pC2Buffer;
     if (mAvHandle->numInts > 0) {
         // use first int in the native_handle as the index
         int index = mAvHandle->data[mAvHandle->numFds];
         std::shared_ptr<C2Param> c2param = std::make_shared<C2DataIdInfo>(index, mDataId);
         std::shared_ptr<C2Info> info(std::static_pointer_cast<C2Info>(c2param));
-        mC2Buffer->setInfo(info);
+        pC2Buffer->setInfo(info);
     }
-    mC2Buffer->registerOnDestroyNotify(&DestroyCallback, this);
+    pC2Buffer->registerOnDestroyNotify(&DestroyCallback, this);
     jobject linearBlock =
             env->NewObject(
                     env->FindClass("android/media/MediaCodec$LinearBlock"),

media/jni/android_media_tv_Tuner.h

diff --git a/media/jni/android_media_tv_Tuner.h b/media/jni/android_media_tv_Tuner.h
index c469a3a..83e9db7 100644
--- a/media/jni/android_media_tv_Tuner.h
+++ b/media/jni/android_media_tv_Tuner.h
@@ -130,7 +130,7 @@
     jweak mMediaEventObj;
     jweak mLinearBlockObj;
     C2HandleIon* mIonHandle;
-    std::shared_ptr<C2Buffer> mC2Buffer;
+    std::weak_ptr<C2Buffer> mC2Buffer;
 };
 
 struct Filter : public RefBase {