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

Merge "Force FilterClient to NOT reset the FMQ pointer when creating the MQ" into sc-dev

Browse Source
This commit is contained in:
Amy Zhang
2021-04-16 18:41:31 +00:00
committed by Android (Google) Code Review
parent e78782b60b 2aa9fa55cc
commit 0aa9d38e9d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -921,7 +921,7 @@ Result FilterClient::getFilterMq() {
Status s = mTunerFilter->getQueueDesc(&aidlMqDesc); Status s = mTunerFilter->getQueueDesc(&aidlMqDesc);
res = ClientHelper::getServiceSpecificErrorCode(s); res = ClientHelper::getServiceSpecificErrorCode(s);
if (res == Result::SUCCESS) { if (res == Result::SUCCESS) {
mFilterMQ = new (nothrow) AidlMQ(aidlMqDesc); mFilterMQ = new (nothrow) AidlMQ(aidlMqDesc, false/*resetPointer*/);
EventFlag::createEventFlag(mFilterMQ->getEventFlagWord(), &mFilterMQEventFlag); EventFlag::createEventFlag(mFilterMQ->getEventFlagWord(), &mFilterMQEventFlag);
} }
return res; return res;
@@ -938,7 +938,7 @@ Result FilterClient::getFilterMq() {
AidlMQDesc aidlMQDesc; AidlMQDesc aidlMQDesc;
unsafeHidlToAidlMQDescriptor<uint8_t, int8_t, SynchronizedReadWrite>( unsafeHidlToAidlMQDescriptor<uint8_t, int8_t, SynchronizedReadWrite>(
filterMQDesc, &aidlMQDesc); filterMQDesc, &aidlMQDesc);
mFilterMQ = new (nothrow) AidlMessageQueue(aidlMQDesc); mFilterMQ = new (nothrow) AidlMessageQueue(aidlMQDesc, false/*resetPointer*/);
EventFlag::createEventFlag(mFilterMQ->getEventFlagWord(), &mFilterMQEventFlag); EventFlag::createEventFlag(mFilterMQ->getEventFlagWord(), &mFilterMQEventFlag);
} }
} }