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

Commit 722ce2ca authored by Pablo Ceballos's avatar Pablo Ceballos Committed by android-build-merger
Browse files

Merge "Revert "SF: detachLayer from Client earlier on destruction"" into nyc-dev am: 99dccfc3 

am: 261b94b5

* commit '261b94b5':
  Revert "SF: detachLayer from Client earlier on destruction"
parents 9765a037 261b94b5

services/surfaceflinger/Layer.cpp

+5 −4
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ void Layer::onFirstRef() { 
}



Layer::~Layer() {

  sp<Client> c(mClientRef.promote());

    if (c != 0) {

        c->detachLayer(this);

    }



    for (auto& point : mRemoteSyncPoints) {

        point->setTransactionApplied();

    }
@@ -258,10 +263,6 @@ void Layer::onSidebandStreamChanged() { 
// the layer has been remove from the current state list (and just before

// it's removed from the drawing state list)

void Layer::onRemoved() {

    sp<Client> c(mClientRef.promote());

    if (c != 0) {

        c->detachLayer(this);

    }

    mSurfaceFlingerConsumer->abandon();

}