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

Commit 59eaeed5 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am 28fc78bf: am e8fed71d: Merge "Abort surface composition if hw surface is invalid" 

* commit '28fc78bf':
  Abort surface composition if hw surface is invalid
parents f9872c81 28fc78bf

services/surfaceflinger/SurfaceFlinger.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1538,7 +1538,11 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const 


    const bool hasGlesComposition = hwc.hasGlesComposition(id) || (cur==end);

    if (hasGlesComposition) {

        DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext);

        if (!DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext)) {

            ALOGW("DisplayDevice::makeCurrent failed. Aborting surface composition for display %s",

                  hw->getDisplayName().string());

            return;

        }



        // set the frame buffer

        glMatrixMode(GL_MODELVIEW);