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

Commit e835976d authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "Tone down a fatal assert" into jb-mr1-dev

parents 27b28fd9 5a8f9012

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