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

Commit 4585657d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle defer transactions on a detached layer" into rvc-qpr-dev am: 112da3a9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12617219

Change-Id: Iea08dae283b2264f88ffd290873e72781a45b916
parents 5ec5cb6a 112da3a9

services/surfaceflinger/Layer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1445,6 +1445,13 @@ Layer::FrameRate Layer::getFrameRateForLayerTree() const { 


void Layer::deferTransactionUntil_legacy(const sp<Layer>& barrierLayer, uint64_t frameNumber) {

    ATRACE_CALL();

    if (mLayerDetached) {

        // If the layer is detached, then we don't defer this transaction since we will not

        // commit the pending state while the layer is detached. Adding sync points may cause

        // the barrier layer to wait for the states to be committed before dequeuing a buffer.

        return;

    }



    mCurrentState.barrierLayer_legacy = barrierLayer;

    mCurrentState.frameNumber_legacy = frameNumber;

    // We don't set eTransactionNeeded, because just receiving a deferral