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

Commit 89add11b authored by John Reck's avatar John Reck
Browse files

resolve merge conflicts of f1df0f59 to master. 

Change-Id: Ia0ae0f753541f5203a4a3683721361c5e90ddae8
parents 5f519e77 f1df0f59

libs/hwui/Caches.cpp

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ void Caches::initStaticProperties() { 


void Caches::terminate() {

    if (!mInitialized) return;

    mRegionMesh.release();

    mRegionMesh.reset(nullptr);



    fboCache.clear();

libs/hwui/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ void Layer::defer(const OpenGLRenderer& rootRenderer) { 
void Layer::cancelDefer() {

    renderNode = nullptr;

    deferredUpdateScheduled = false;

    deferredList.release();

    deferredList.reset(nullptr);

}



void Layer::flush() {