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

Commit bb147c11 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "mTraits is used without been locked"

parents 347b9799 51f5abaf

media/codec2/vndk/C2AllocatorIon.cpp

+2 −2
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ c2_status_t C2AllocatorIon::newLinearAllocation( 
    }



    std::shared_ptr<C2AllocationIon> alloc

        = std::make_shared<C2AllocationIon>(dup(mIonFd), capacity, align, heapMask, flags, mTraits->id);

        = std::make_shared<C2AllocationIon>(dup(mIonFd), capacity, align, heapMask, flags, getId());

    ret = alloc->status();

    if (ret == C2_OK) {

        *allocation = alloc;
@@ -622,7 +622,7 @@ c2_status_t C2AllocatorIon::priorLinearAllocation( 
    // TODO: get capacity and validate it

    const C2HandleIon *h = static_cast<const C2HandleIon*>(handle);

    std::shared_ptr<C2AllocationIon> alloc

        = std::make_shared<C2AllocationIon>(dup(mIonFd), h->size(), h->bufferFd(), mTraits->id);

        = std::make_shared<C2AllocationIon>(dup(mIonFd), h->size(), h->bufferFd(), getId());

    c2_status_t ret = alloc->status();

    if (ret == C2_OK) {

        *allocation = alloc;