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

Commit 1f0ffc46 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

workaround for [2113743] Sholes: frozen then runtime restart going to list view

parent 03268374

libs/surfaceflinger/Layer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ void Layer::destroy() 
        mBuffers[i].clear();

        mWidth = mHeight = 0;

    }

    mSurface.clear();

}



sp<LayerBaseClient::Surface> Layer::createSurface() const
@@ -99,7 +98,8 @@ sp<LayerBaseClient::Surface> Layer::createSurface() const 
status_t Layer::ditch()

{

    // the layer is not on screen anymore. free as much resources as possible

    destroy();

    //destroy();

    mSurface.clear();

    return NO_ERROR;

}

libs/surfaceflinger/SurfaceFlinger.cpp

+17 −4
Original line number Diff line number Diff line
@@ -1084,9 +1084,12 @@ status_t SurfaceFlinger::removeLayer_l(const sp<LayerBase>& layerBase) 


status_t SurfaceFlinger::purgatorizeLayer_l(const sp<LayerBase>& layerBase)

{

    // remove the layer from the main list (through a transaction).

    // First add the layer to the purgatory list, which makes sure it won't 

    // go away, then remove it from the main list (through a transaction).

    ssize_t err = removeLayer_l(layerBase);



    if (err >= 0) {

        mLayerPurgatory.add(layerBase);

    }

    // it's possible that we don't find a layer, because it might

    // have been destroyed already -- this is not technically an error

    // from the user because there is a race between BClient::destroySurface(),
@@ -1359,8 +1362,18 @@ status_t SurfaceFlinger::destroySurface(const sp<LayerBaseClient>& layer) 
             * to use the purgatory.

             */

            status_t err = flinger->removeLayer_l(l);

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

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

            if (err == NAME_NOT_FOUND) {

                // The surface wasn't in the current list, which means it was

                // removed already, which means it is in the purgatory, 

                // and need to be removed from there.

                // This needs to happen from the main thread since its dtor

                // must run from there (b/c of OpenGL ES). Additionally, we

                // can't really acquire our internal lock from 

                // destroySurface() -- see postMessage() below.

                ssize_t idx = flinger->mLayerPurgatory.remove(l);

                LOGE_IF(idx < 0,

                        "layer=%p is not in the purgatory list", l.get());

            }

            return true;

        }

    };

libs/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ private: 
    volatile    int32_t                 mTransactionCount;

                Condition               mTransactionCV;

                bool                    mResizeTransationPending;

                SortedVector< sp<LayerBase> > mLayerPurgatory;

                

                // protected by mStateLock (but we could use another lock)

                Tokenizer                               mTokens;