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

Commit e272b25a authored by Mathias Agopian's avatar Mathias Agopian Committed by The Android Automerger
Browse files

only abort when errors happen on the main display 

Bug: 7232690
Change-Id: I2c4b35a82f131da26deea738ef294e100e536d15
parent 52d3d4de

services/surfaceflinger/DisplayDevice.cpp

+8 −5
Original line number Diff line number Diff line
@@ -228,12 +228,15 @@ void DisplayDevice::swapBuffers(HWComposer& hwc) const { 
        }

    }



    // TODO: we should at least handle EGL_CONTEXT_LOST, by recreating the

    // context and resetting our state.

    LOG_ALWAYS_FATAL_IF(!success,

            "eglSwapBuffers(%p, %p) failed with 0x%8x",

    if (!success) {

        EGLint error = eglGetError();

        if (error == EGL_CONTEXT_LOST ||

                mType == DisplayDevice::DISPLAY_PRIMARY) {

            LOG_ALWAYS_FATAL("eglSwapBuffers(%p, %p) failed with 0x%08x",

                    mDisplay, mSurface, eglGetError());

        }

    }

}



void DisplayDevice::onSwapBuffersCompleted(HWComposer& hwc) const {

    if (hwc.initCheck() == NO_ERROR) {