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

Merge "Fix Filter/DVR MQ leak"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-09 22:16:13 +00:00
committed by Android (Google) Code Review
parent 8e9b12cd16 0f63388513
commit 4a491a1ebc
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/jni/tuner/DvrClient.cpp
View File

@@ -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();

9
media/jni/tuner/FilterClient.cpp
View File

@@ -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();