commit 952f995574aeb73398a34cbff83e7e5913deb003
author ning xu <xuning5@xiaomi.com> Fri Oct 29 02:44:49 2021 +0000
committer ning xu <xuning5@xiaomi.com> Wed Nov 03 06:08:19 2021 +0000
tree 19ca2a690f203101ff449dd2e776502fa7087231
parent 53cb0241c3ad398e28668879e1a57ee5a30e848a

Fixes broken build on crosshatch-userdebug when enable LOG_NDEBUG

Bug: 204795912
Test: enable LOG_NDEBUG in VirtualDisplaySurface.cpp,no broken build occures
Change-Id: I84622ff60e128729ee1d239d5209e4510e709326
Signed-off-by: xuning5<xuning5@xiaomi.com>

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(