Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a4ebe51 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixes broken build on crosshatch-userdebug when enable LOG_NDEBUG" am: 6096e141 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1875033

Change-Id: I919b932e54b929ed2225f27ec11919211a066687
parents 01f68a18 6096e141

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ status_t VirtualDisplaySurface::setAsyncMode(bool async) { 


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 @@ void VirtualDisplaySurface::resetPerFrameState() { 
}



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(