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

Commit 3c13a41a authored by Irvel Nduva Matias Vega's avatar Irvel Nduva Matias Vega Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'SF: Fix a couple of Layer ref count issues' 

* changes:
  SF: Change wp usage for deferred transactions in the interceptor to sp
  SF: Fix a couple of Layer ref count issues
parents d204bfc7 3017c615

services/surfaceflinger/Client.cpp

+1 −4
Original line number Diff line number Diff line
@@ -43,10 +43,7 @@ Client::~Client() 
{

    const size_t count = mLayers.size();

    for (size_t i=0 ; i<count ; i++) {

        sp<Layer> layer(mLayers.valueAt(i).promote());

        if (layer != 0) {

            mFlinger->removeLayer(layer);

        }

        mFlinger->removeLayer(mLayers.valueAt(i));

    }

}

services/surfaceflinger/Layer.cpp

+8 −3
Original line number Diff line number Diff line
@@ -1313,9 +1313,14 @@ void Layer::pushPendingState() { 
    // If this transaction is waiting on the receipt of a frame, generate a sync

    // point and send it to the remote layer.

    if (mCurrentState.handle != nullptr) {

        sp<Handle> handle = static_cast<Handle*>(mCurrentState.handle.get());

        sp<Layer> handleLayer = handle->owner.promote();

        if (handleLayer == nullptr) {

        sp<IBinder> strongBinder = mCurrentState.handle.promote();

        sp<Handle> handle = nullptr;

        sp<Layer> handleLayer = nullptr;

        if (strongBinder != nullptr) {

            handle = static_cast<Handle*>(strongBinder.get());

            handleLayer = handle->owner.promote();

        }

        if (strongBinder == nullptr || handleLayer == nullptr) {

            ALOGE("[%s] Unable to promote Layer handle", mName.string());

            // If we can't promote the layer we are intended to wait on,

            // then it is expired or otherwise invalid. Allow this transaction

services/surfaceflinger/Layer.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ public: 


        // If set, defers this state update until the Layer identified by handle

        // receives a frame with the given frameNumber

        sp<IBinder> handle;

        wp<IBinder> handle;

        uint64_t frameNumber;



        // the transparentRegion hint is a bit special, it's latched only

services/surfaceflinger/SurfaceFlinger.cpp

+8 −9
Original line number Diff line number Diff line
@@ -2283,8 +2283,14 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, 
    return NO_ERROR;

}



status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer) {

status_t SurfaceFlinger::removeLayer(const wp<Layer>& weakLayer) {

    Mutex::Autolock _l(mStateLock);

    sp<Layer> layer = weakLayer.promote();

    if (layer == nullptr) {

        // The layer has already been removed, carry on

        return NO_ERROR;

    }



    ssize_t index = mCurrentState.layersSortedByZ.remove(layer);

    if (index >= 0) {

        mLayersPendingRemoval.push(layer);
@@ -2630,14 +2636,7 @@ status_t SurfaceFlinger::onLayerDestroyed(const wp<Layer>& layer) 
{

    // called by ~LayerCleaner() when all references to the IBinder (handle)

    // are gone

    status_t err = NO_ERROR;

    sp<Layer> l(layer.promote());

    if (l != NULL) {

        err = removeLayer(l);

        ALOGE_IF(err<0 && err != NAME_NOT_FOUND,

                "error removing layer=%p (%s)", l.get(), strerror(-err));

    }

    return err;

    return removeLayer(layer);

}



// ---------------------------------------------------------------------------

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ private: 
    status_t onLayerDestroyed(const wp<Layer>& layer);



    // remove a layer from SurfaceFlinger immediately

    status_t removeLayer(const sp<Layer>& layer);

    status_t removeLayer(const wp<Layer>& layer);



    // add a layer to SurfaceFlinger

    status_t addClientLayer(const sp<Client>& client,