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

Commit dc1f673e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GraphicsTracker: ensure migrated buffers are overwritten" into main am: 7e0e4f15 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3236919



Change-Id: I17f49f59dcf047aedc6d891cc10bfd0e4c512f1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b363e91 7e0e4f15

media/codec2/hal/client/GraphicsTracker.cpp

+4 −1
Original line number Diff line number Diff line
@@ -900,7 +900,10 @@ void GraphicsTracker::commitRender(const std::shared_ptr<BufferCache> &cache, 
        cache->unblockSlot(buffer->mSlot);

        if (oldBuffer) {

            // migrated, register the new buffer to the cache.

            cache->mBuffers.emplace(buffer->mSlot, buffer);

            auto ret = cache->mBuffers.emplace(buffer->mSlot, buffer);

            if (!ret.second) {

                ret.first->second = buffer;

            }

        }

    }

    mDeallocating.erase(origBid);