Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa9d38e authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

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

parents e78782b6 2aa9fa55

media/jni/tuner/FilterClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ Result FilterClient::getFilterMq() { 
        Status s = mTunerFilter->getQueueDesc(&aidlMqDesc);

        res = ClientHelper::getServiceSpecificErrorCode(s);

        if (res == Result::SUCCESS) {

            mFilterMQ = new (nothrow) AidlMQ(aidlMqDesc);

            mFilterMQ = new (nothrow) AidlMQ(aidlMqDesc, false/*resetPointer*/);

            EventFlag::createEventFlag(mFilterMQ->getEventFlagWord(), &mFilterMQEventFlag);

        }

        return res;
@@ -938,7 +938,7 @@ Result FilterClient::getFilterMq() { 
            AidlMQDesc aidlMQDesc;

            unsafeHidlToAidlMQDescriptor<uint8_t, int8_t, SynchronizedReadWrite>(

                    filterMQDesc,  &aidlMQDesc);

            mFilterMQ = new (nothrow) AidlMessageQueue(aidlMQDesc);

            mFilterMQ = new (nothrow) AidlMessageQueue(aidlMQDesc, false/*resetPointer*/);

            EventFlag::createEventFlag(mFilterMQ->getEventFlagWord(), &mFilterMQEventFlag);

        }

    }