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

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

Merge "GraphicsTracker: Do not crash from getting AHardwareBuffer id" into... 

Merge "GraphicsTracker: Do not crash from getting AHardwareBuffer id" into main am: 13c434b9 am: 44c1b297

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



Change-Id: Ia6b875dc59729ac3a5ac41d8744d44bba6738dc8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1f8c488 44c1b297

media/codec2/hal/client/GraphicsTracker.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static constexpr int kMaxDequeueMax = ::android::BufferQueueDefs::NUM_BUFFER_SLO 


c2_status_t retrieveAHardwareBufferId(const C2ConstGraphicBlock &blk, uint64_t *bid) {

    std::shared_ptr<const _C2BlockPoolData> bpData = _C2BlockFactory::GetGraphicBlockPoolData(blk);

    if (bpData->getType() != _C2BlockPoolData::TYPE_AHWBUFFER) {

    if (!bpData || bpData->getType() != _C2BlockPoolData::TYPE_AHWBUFFER) {

        return C2_BAD_VALUE;

    }

    if (__builtin_available(android __ANDROID_API_T__, *)) {