| commit | 88df44d1590ab5b6ebaad3c273f6ecf0741c36ce | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Aug 30 22:50:47 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 30 22:50:47 2024 +0000 |
| tree | d839e41102664ba6d6f81ceb10af686bbd32836c | |
| parent | d1f8c4887ec7763a1bf0170a0d6d3db66f63cf64 [diff] | |
| parent | 44c1b2974094090567b06257ca2b113ad2caba96 [diff] |
Merge "GraphicsTracker: Do not crash from getting AHardwareBuffer id" into main am: 13c434b9d3 am: 44c1b29740 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3250896 Change-Id: Ia6b875dc59729ac3a5ac41d8744d44bba6738dc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/hal/client/GraphicsTracker.cpp b/media/codec2/hal/client/GraphicsTracker.cpp index efac892..bdfc409 100644 --- a/media/codec2/hal/client/GraphicsTracker.cpp +++ b/media/codec2/hal/client/GraphicsTracker.cpp
@@ -34,7 +34,7 @@ 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__, *)) {