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

Commit f9d194e0 authored by Dan Stoza's avatar Dan Stoza Committed by android-build-merger
Browse files

Merge "SF: Clear local sync points on hide and destroy" into nyc-dev 

am: 54ebc564

* commit '54ebc564':
  SF: Clear local sync points on hide and destroy

Change-Id: If6d5cb161e5ed9633a2719f07943f9419d2f4a09
parents c9d71325 54ebc564

services/surfaceflinger/Layer.cpp

+14 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ Layer::~Layer() { 
    for (auto& point : mRemoteSyncPoints) {

        point->setTransactionApplied();

    }

    for (auto& point : mLocalSyncPoints) {

        point->setFrameAvailable();

    }

    mFlinger->deleteTextureAsync(mTextureName);

    mFrameTracker.logAndResetStats(mName);

}
@@ -1478,6 +1481,17 @@ uint32_t Layer::doTransaction(uint32_t flags) { 
                (type >= Transform::SCALE));

    }



    // If the layer is hidden, signal and clear out all local sync points so

    // that transactions for layers depending on this layer's frames becoming

    // visible are not blocked

    if (c.flags & layer_state_t::eLayerHidden) {

        Mutex::Autolock lock(mLocalSyncPointMutex);

        for (auto& point : mLocalSyncPoints) {

            point->setFrameAvailable();

        }

        mLocalSyncPoints.clear();

    }



    // Commit the transaction

    commitTransaction(c);

    return flags;