commit 8f71501b795d3891279e4930b879856b56c12429
author Patrick Williams <pdwilliams@google.com> Wed Jul 24 15:31:03 2024 -0500
committer Patrick Williams <pdwilliams@google.com> Wed Jul 24 15:33:56 2024 -0500
tree 745db0456d6de4990c3ae5c2b25965f484366fe3
parent 9aeb2cbfaa53fc193044cc711655ec44e31d62a5

Fix BufferReleaseChannel flagging.

Bug: 294133380
Test: presubmits
Flag: com.android.graphics.libgui.flags.buffer_release_channel
Change-Id: Iad39b9eb77b57e32521f7ba447a66510967c8209

libs/gui/BLASTBufferQueue.cpp

diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index f13d499..767f3e8 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -525,7 +525,9 @@
     }
     mNumAcquired--;
     updateDequeueShouldBlockLocked();
-    mBufferReleaseReader->interruptBlockingRead();
+    if (mBufferReleaseReader) {
+        mBufferReleaseReader->interruptBlockingRead();
+    }
     BBQ_TRACE("frame=%" PRIu64, callbackId.framenumber);
     BQA_LOGV("released %s", callbackId.to_string().c_str());
     mBufferItemConsumer->releaseBuffer(it->second, releaseFence);
@@ -857,7 +859,10 @@
         mNumDequeued--;
         updateDequeueShouldBlockLocked();
     }
-    mBufferReleaseReader->interruptBlockingRead();
+
+    if (mBufferReleaseReader) {
+        mBufferReleaseReader->interruptBlockingRead();
+    }
 };
 
 bool BLASTBufferQueue::syncNextTransaction(
@@ -1191,7 +1196,10 @@
             bbq->mSubmitted.clear();
             bbq->updateDequeueShouldBlockLocked();
         }
-        bbq->mBufferReleaseReader->interruptBlockingRead();
+
+        if (bbq->mBufferReleaseReader) {
+            bbq->mBufferReleaseReader->interruptBlockingRead();
+        }
 
         return OK;
     }
@@ -1215,7 +1223,10 @@
             bbq->mMaxDequeuedBuffers = maxDequeuedBufferCount;
             bbq->updateDequeueShouldBlockLocked();
         }
-        bbq->mBufferReleaseReader->interruptBlockingRead();
+
+        if (bbq->mBufferReleaseReader) {
+            bbq->mBufferReleaseReader->interruptBlockingRead();
+        }
 
         size_t newFrameHistorySize = maxBufferCount + 2; // +2 because triple buffer rendering
         // optimize away resizing the frame history unless it will grow
@@ -1251,7 +1262,9 @@
             bbq->updateDequeueShouldBlockLocked();
         }
 
-        bbq->mBufferReleaseReader->interruptBlockingRead();
+        if (bbq->mBufferReleaseReader) {
+            bbq->mBufferReleaseReader->interruptBlockingRead();
+        }
         return NO_ERROR;
     }
 
@@ -1272,7 +1285,9 @@
             bbq->updateDequeueShouldBlockLocked();
         }
 
-        bbq->mBufferReleaseReader->interruptBlockingRead();
+        if (bbq->mBufferReleaseReader) {
+            bbq->mBufferReleaseReader->interruptBlockingRead();
+        }
         return NO_ERROR;
     }
 
@@ -1292,7 +1307,9 @@
             bbq->updateDequeueShouldBlockLocked();
         }
 
-        bbq->mBufferReleaseReader->interruptBlockingRead();
+        if (bbq->mBufferReleaseReader) {
+            bbq->mBufferReleaseReader->interruptBlockingRead();
+        }
         return NO_ERROR;
     }