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

Commit 5a8f9012 authored by Andy McFadden's avatar Andy McFadden
Browse files

Tone down a fatal assert 

The new disconnectDisplay function doesn't handle virtual displays,
but it may be called for them.  Return without doing anything.

Bug 7281786

Change-Id: I62607f2ae6073fa66b393f55932604aeb8e03566
parent 9a143922

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+5 −2
Original line number Diff line number Diff line
@@ -686,8 +686,11 @@ status_t HWComposer::acquire(int disp) { 
}



void HWComposer::disconnectDisplay(int disp) {

    LOG_ALWAYS_FATAL_IF(disp < 0 || disp == HWC_DISPLAY_PRIMARY ||

                        disp >= HWC_NUM_DISPLAY_TYPES);

    LOG_ALWAYS_FATAL_IF(disp < 0 || disp == HWC_DISPLAY_PRIMARY);

    if (disp >= HWC_NUM_DISPLAY_TYPES) {

        // nothing to do for these yet

        return;

    }

    DisplayData& dd(mDisplayData[disp]);

    if (dd.list != NULL) {

        free(dd.list);