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

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

am 46820412: am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t... 

am 46820412: am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread

Merge commit '46820412'

* commit '46820412':
  don't try to lock a buffer that wasn't allocated with SW usage bits
parents 16376afb 46820412

services/surfaceflinger/Layer.cpp

+10 −6
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ void Layer::reloadTexture(const Region& dirty) 
    } else {

slowpath:

        GGLSurface t;

        if (buffer->usage & GRALLOC_USAGE_SW_READ_MASK) {

            status_t res = buffer->lock(&t, GRALLOC_USAGE_SW_READ_OFTEN);

            LOGE_IF(res, "error %d (%s) locking buffer %p",

                    res, strerror(res), buffer.get());
@@ -260,6 +261,9 @@ slowpath: 
                mBufferManager.loadTexture(dirty, t);

                buffer->unlock();

            }

        } else {

            // we can't do anything

        }

    }

}