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

Commit c8a1e48e authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "surfaceflinger: fix z-relative layer destruction" into oc-mr1-dev 

am: 11e66edf

Change-Id: I8210bbb66165da88aa3331a31f134f0088d9f01e
parents eebd76a6 11e66edf

services/surfaceflinger/Layer.cpp

+17 −8
Original line number Diff line number Diff line
@@ -203,9 +203,11 @@ Layer::~Layer() { 
    mFrameTracker.logAndResetStats(mName);



#ifdef USE_HWC2

    ALOGE_IF(!mHwcLayers.empty(),

            "Found stale hardware composer layers when destroying "

            "surface flinger layer");

    if (!mHwcLayers.empty()) {

        ALOGE("Found stale hardware composer layers when destroying "

                "surface flinger layer %s", mName.string());

        destroyAllHwcLayers();

    }

#endif

}
@@ -294,20 +296,27 @@ void Layer::onSidebandStreamChanged() { 
    }

}



// called with SurfaceFlinger::mStateLock from the drawing thread after

// the layer has been remove from the current state list (and just before

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

void Layer::onRemoved() {

void Layer::onRemovedFromCurrentState() {

    // the layer is removed from SF mCurrentState to mLayersPendingRemoval



    if (mCurrentState.zOrderRelativeOf != nullptr) {

        sp<Layer> strongRelative = mCurrentState.zOrderRelativeOf.promote();

        if (strongRelative != nullptr) {

            strongRelative->removeZOrderRelative(this);

            mFlinger->setTransactionFlags(eTraversalNeeded);

        }

        mCurrentState.zOrderRelativeOf = nullptr;

    }



    mSurfaceFlingerConsumer->abandon();

    for (const auto& child : mCurrentChildren) {

        child->onRemovedFromCurrentState();

    }

}



void Layer::onRemoved() {

    // the layer is removed from SF mLayersPendingRemoval



    mSurfaceFlingerConsumer->abandon();

#ifdef USE_HWC2

    destroyAllHwcLayers();

#endif

services/surfaceflinger/Layer.h

+8 −2
Original line number Diff line number Diff line
@@ -420,8 +420,14 @@ public: 
    bool isPotentialCursor() const { return mPotentialCursor;}



    /*

     * called with the state lock when the surface is removed from the

     * current list

     * called with the state lock from a binder thread when the layer is

     * removed from the current list to the pending removal list

     */

    void onRemovedFromCurrentState();



    /*

     * called with the state lock from the main thread when the layer is

     * removed from the pending removal list

     */

    void onRemoved();

services/surfaceflinger/SurfaceFlinger.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2833,6 +2833,7 @@ status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer, bool topLevelOnly) 
        return NO_ERROR;

    }



    layer->onRemovedFromCurrentState();

    mLayersPendingRemoval.add(layer);

    mLayersRemoved = true;

    mNumLayers -= 1 + layer->getChildrenCount();

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2411,6 +2411,7 @@ status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer, bool topLevelOnly) 
        return NO_ERROR;

    }



    layer->onRemovedFromCurrentState();

    mLayersPendingRemoval.add(layer);

    mLayersRemoved = true;

    mNumLayers -= 1 + layer->getChildrenCount();