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

Commit 882c7513 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am f1195be7: am a91e54fe: am f57c1388: Merge "SurfaceFlinger: fix layer... 

am f1195be7: am a91e54fe: am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1

* commit 'f1195be710e72b3f8016c149b104d732dd20a531':
  SurfaceFlinger: fix layer removal race condition
parents e09e7297 43bfe7f0

services/surfaceflinger/SurfaceFlinger.cpp

+9 −1
Original line number Diff line number Diff line
@@ -720,6 +720,14 @@ void SurfaceFlinger::computeVisibleRegions( 


void SurfaceFlinger::commitTransaction()

{

    if (!mLayersPendingRemoval.isEmpty()) {

        // Notify removed layers now that they can't be drawn from

        for (size_t i = 0; i < mLayersPendingRemoval.size(); i++) {

            mLayersPendingRemoval[i]->onRemoved();

        }

        mLayersPendingRemoval.clear();

    }



    mDrawingState = mCurrentState;

    mTransationPending = false;

    mTransactionCV.broadcast();
@@ -1172,7 +1180,7 @@ status_t SurfaceFlinger::purgatorizeLayer_l(const sp<LayerBase>& layerBase) 
        mLayerPurgatory.add(layerBase);

    }



    layerBase->onRemoved();

    mLayersPendingRemoval.push(layerBase);



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

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

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ private: 
                Condition               mTransactionCV;

                SortedVector< sp<LayerBase> > mLayerPurgatory;

                bool                    mTransationPending;

                Vector< sp<LayerBase> > mLayersPendingRemoval;



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

                GraphicPlane                mGraphicPlanes[1];