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

Commit aaf62408 authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Android (Google) Code Review
Browse files

Merge changes Ib6985cf1,I61b18104 

* changes:
  SF: Relax assertions for primary display removal
  SF: Ignore setActiveColorMode errors
parents 62c80900 19901361

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -666,7 +666,6 @@ void HWComposer::disconnectDisplay(HalDisplayId displayId) { 
    RETURN_IF_INVALID_DISPLAY(displayId);

    auto& displayData = mDisplayData[displayId];

    const auto hwcDisplayId = displayData.hwcDisplay->getId();

    LOG_ALWAYS_FATAL_IF(hwcDisplayId == mPrimaryHwcDisplayId);



    mPhysicalDisplayIdMap.erase(hwcDisplayId);

    mDisplayData.erase(displayId);

services/surfaceflinger/SurfaceFlinger.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1328,7 +1328,9 @@ status_t SurfaceFlinger::setActiveColorMode(const sp<IBinder>& displayToken, Col 
        return NO_ERROR;

    });



    return future.get();

    // TODO(b/195698395): Propagate error.

    future.wait();

    return NO_ERROR;

}



void SurfaceFlinger::setAutoLowLatencyMode(const sp<IBinder>& displayToken, bool on) {