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

Commit d1ddcf19 authored by John Reck's avatar John Reck
Browse files

resolve merge conflicts of 9ea52955 to master. 

Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50
parents af78708e 9ea52955

libs/hwui/renderthread/EglManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ bool EglManager::swapBuffers(const Frame& frame, const SkRect& screenDirty) { 
        // For some reason our surface was destroyed out from under us

        // This really shouldn't happen, but if it does we can recover easily

        // by just not trying to use the surface anymore

        ALOGW("swapBuffers encountered EGL_BAD_SURFACE on %p, halting rendering...",

                frame.mSurface);

        ALOGW("swapBuffers encountered EGL error %d on %p, halting rendering...",

                err, frame.mSurface);

        return false;

    }

    LOG_ALWAYS_FATAL("Encountered EGL error %d %s during rendering",