diff options
| author | 2023-05-16 22:32:18 +0000 | |
|---|---|---|
| committer | 2023-05-16 22:32:18 +0000 | |
| commit | 26cd24b96554b6b75ff5bf023b0128dd83f2c8e5 (patch) | |
| tree | 44fc5342327f19a54c368034753deac6a4d5853f /libs | |
| parent | bec552315010f79a6ca98880cfedac995de63e1f (diff) | |
| parent | 9a8ab9a0f72032fa1ba370976b119e8ff665301f (diff) | |
Merge "Fix libgui cts crash bug" am: b6dcc4c2a0 am: 9a8ab9a0f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2057372
Change-Id: I880556723f614f3f0f778f73c3d030b829f0ebd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -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; |