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

Commit dcf63bb8 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'master' into honeycomb-release

parents 29dc7a8f c407b117

services/surfaceflinger/Layer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ sp<GraphicBuffer> Layer::requestBuffer(int index, 
        Mutex::Autolock _l(mLock);



        // zero means default

        const bool fixedSize = reqWidth && reqHeight;

        if (!reqFormat) reqFormat = mFormat;

        if (!reqWidth)  reqWidth = mWidth;

        if (!reqHeight) reqHeight = mHeight;
@@ -380,7 +381,7 @@ sp<GraphicBuffer> Layer::requestBuffer(int index, 
            mReqWidth  = reqWidth;

            mReqHeight = reqHeight;

            mReqFormat = reqFormat;

            mFixedSize = reqWidth && reqHeight;

            mFixedSize = fixedSize;



            lcblk->reallocateAllExcept(index);

        }