commit 855810c4e9c2e03d025d47f75ba199586af791d5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 17 00:31:04 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 17 00:31:04 2023 +0000
tree 4030d114594940204a23320e8bb4c08851c57594
parent b6dcc4c2a0b2fca19c4fa36d3a1f04bf7aa41a61
parent 3162ce055889c81e502b3a0b8ba4a3e96a7d0a2f

Merge "Fixing test failure on hwasan builds"

libs/gui/BufferQueueProducer.cpp

diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 9eb1a9f..f934680 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -615,7 +615,8 @@
     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;