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

Commit 19901361 authored by Dominik Laskowski's avatar Dominik Laskowski
Browse files

SF: Relax assertions for primary display removal 

HWComposer::disconnectDisplay is called during hotplug reconnect.

Bug: 195467065
Test: No abort on primary display reconnect.
Change-Id: Ib6985cf1cd551c7f60fe27d048235a3b466da6aa
parent 0a5f921c

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);