commit 6096e1412aa55fd417df32c24bc8eede209a6eb3
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 03 20:42:17 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 03 20:42:17 2021 +0000
tree 8cd28e226196591f3a580f83c10a1773eaa7ea65
parent 1b07286375857a1723cf1f761d85cfd701b3a17b
parent 952f995574aeb73398a34cbff83e7e5913deb003

Merge "Fixes broken build on crosshatch-userdebug when enable LOG_NDEBUG"

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
index e26ab11..82a9ae2 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
@@ -326,7 +326,7 @@
 
 status_t VirtualDisplaySurface::dequeueBuffer(Source source,
         PixelFormat format, uint64_t usage, int* sslot, sp<Fence>* fence) {
-    LOG_FATAL_IF(GpuVirtualDisplayId::tryCast(mDisplayId));
+    LOG_ALWAYS_FATAL_IF(GpuVirtualDisplayId::tryCast(mDisplayId).has_value());
 
     status_t result =
             mSource[source]->dequeueBuffer(sslot, fence, mSinkBufferWidth, mSinkBufferHeight,
@@ -641,7 +641,7 @@
 }
 
 status_t VirtualDisplaySurface::refreshOutputBuffer() {
-    LOG_FATAL_IF(GpuVirtualDisplayId::tryCast(mDisplayId));
+    LOG_ALWAYS_FATAL_IF(GpuVirtualDisplayId::tryCast(mDisplayId).has_value());
 
     if (mOutputProducerSlot >= 0) {
         mSource[SOURCE_SINK]->cancelBuffer(