Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix memory leak in initilization and finalization" into sc-dev

Browse Source
This commit is contained in:
Henry Fang
2021-07-09 15:48:09 +00:00
committed by Android (Google) Code Review
parent a7af7f8346 f3e53d082c
commit d2b280408b
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/jni/android_media_tv_Tuner.cpp
View File

@@ -339,6 +339,12 @@ MediaEvent::~MediaEvent() {
if (pC2Buffer != NULL) { if (pC2Buffer != NULL) {
pC2Buffer->unregisterOnDestroyNotify(&DestroyCallback, this); pC2Buffer->unregisterOnDestroyNotify(&DestroyCallback, this);
} }
if (mLinearBlockObj != NULL) {
env->DeleteWeakGlobalRef(mLinearBlockObj);
mLinearBlockObj = NULL;
}
mFilterClient = NULL; mFilterClient = NULL;
} }
@@ -2450,7 +2456,10 @@ static sp<JTuner> setTuner(JNIEnv *env, jobject thiz, const sp<JTuner> &tuner) {
if (old != NULL) { if (old != NULL) {
old->decStrong(thiz); old->decStrong(thiz);
} }
env->SetLongField(thiz, gFields.tunerContext, (jlong)tuner.get());
if (tuner != NULL) {
env->SetLongField(thiz, gFields.tunerContext, (jlong)tuner.get());
}
return old; return old;
} }
@@ -4042,6 +4051,7 @@ static jint android_media_tv_Tuner_open_demux(JNIEnv* env, jobject thiz, jint ha
static jint android_media_tv_Tuner_close_tuner(JNIEnv* env, jobject thiz) { static jint android_media_tv_Tuner_close_tuner(JNIEnv* env, jobject thiz) {
sp<JTuner> tuner = getTuner(env, thiz); sp<JTuner> tuner = getTuner(env, thiz);
setTuner(env, thiz, NULL);
return (jint) tuner->close(); return (jint) tuner->close();
} }