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

Commit bef45247 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 26715 into eclair 

* changes:
  fix [2133214] STOPSHIP: revert I4a06bb4f: workaround for [2113743] Sholes: frozen then runtime restart going to list view
parents 118abc10 8c0a3d75

libs/surfaceflinger/Layer.cpp

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

        mBuffers[i].clear();

        mWidth = mHeight = 0;

        mWidth = mHeight = 0;

    }

    }

    mSurface.clear();

}

}





sp<LayerBaseClient::Surface> Layer::createSurface() const

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

status_t Layer::ditch()

{

{

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

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

    //destroy();

    destroy();

    mSurface.clear();

    return NO_ERROR;

    return NO_ERROR;

}

}

libs/surfaceflinger/SurfaceFlinger.cpp

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




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

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

{

{

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

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

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

    ssize_t err = removeLayer_l(layerBase);

    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

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

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

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

    // from the user because there is a race between BClient::destroySurface(),

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

             * to use the purgatory.

             */

             */

            status_t err = flinger->removeLayer_l(l);

            status_t err = flinger->removeLayer_l(l);

            if (err == NAME_NOT_FOUND) {

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

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

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

                // 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;

            return true;

        }

        }

    };

    };

libs/surfaceflinger/SurfaceFlinger.h

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

    volatile    int32_t                 mTransactionCount;

                Condition               mTransactionCV;

                Condition               mTransactionCV;

                bool                    mResizeTransationPending;

                bool                    mResizeTransationPending;

                SortedVector< sp<LayerBase> > mLayerPurgatory;

                

                

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

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

                Tokenizer                               mTokens;

                Tokenizer                               mTokens;