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

Commit 4bd74e81 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 871f9de3: am 02472639: am 083a557c: fix [2319255] crash in openGL : from... 

am 871f9de3: am 02472639: am 083a557c: fix [2319255] crash in openGL : from the media recorder stress test.

Merge commit '871f9de3554ccfd2028837dea97b76fcaf5ffedb'

* commit '871f9de3554ccfd2028837dea97b76fcaf5ffedb':
  fix [2319255] crash in openGL : from the media recorder stress test.
parents 975e03a9 fc01eaf5

libs/surfaceflinger/Layer.cpp

+8 −1
Original line number Diff line number Diff line
@@ -134,7 +134,14 @@ void Layer::reloadTexture(const Region& dirty) 
{

    Mutex::Autolock _l(mLock);

    sp<GraphicBuffer> buffer(getFrontBufferLocked());

    int index = mFrontBufferIndex;

    if (buffer == NULL) {

        // this situation can happen if we ran out of memory for instance.

        // not much we can do. continue to use whatever texture was bound

        // to this context.

        return;

    }



    const int index = mFrontBufferIndex;



    // create the new texture name if needed

    if (UNLIKELY(mTextures[index].name == -1U)) {