diff options
| author | 2023-05-16 21:47:56 +0000 | |
|---|---|---|
| committer | 2023-05-16 21:47:56 +0000 | |
| commit | 9a8ab9a0f72032fa1ba370976b119e8ff665301f (patch) | |
| tree | 997f1be293a8cf63a6e623f7956dc149eb66dc72 /libs/gui/BufferQueueProducer.cpp | |
| parent | 73f6315b96cc71d87b3a02735798be0f111f1734 (diff) | |
| parent | b6dcc4c2a0b2fca19c4fa36d3a1f04bf7aa41a61 (diff) | |
Merge "Fix libgui cts crash bug" am: b6dcc4c2a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2057372
Change-Id: I8630a34ebfb724f9330204f641d7ba9f0beb8c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/BufferQueueProducer.cpp')
| -rw-r--r-- | libs/gui/BufferQueueProducer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp index 9eb1a9f526..f93468036f 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -615,7 +615,8 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou BQ_LOGV("dequeueBuffer: returning slot=%d/%" PRIu64 " buf=%p flags=%#x", *outSlot, mSlots[*outSlot].mFrameNumber, - mSlots[*outSlot].mGraphicBuffer->handle, returnFlags); + mSlots[*outSlot].mGraphicBuffer != nullptr ? + mSlots[*outSlot].mGraphicBuffer->handle : nullptr, returnFlags); if (outBufferAge) { *outBufferAge = mCore->mBufferAge; |