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

Commit 7b2fc930 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: Limit to 4k Layers" into mnc-dev

parents 5a5d0672 7d89d06a

services/surfaceflinger/SurfaceFlinger.cpp

+21 −8
Original line number Diff line number Diff line
@@ -2018,20 +2018,27 @@ void SurfaceFlinger::drawWormhole(const sp<const DisplayDevice>& hw, const Regio 
    engine.fillRegionWithColor(region, height, 0, 0, 0, 0);

}



void SurfaceFlinger::addClientLayer(const sp<Client>& client,

status_t SurfaceFlinger::addClientLayer(const sp<Client>& client,

        const sp<IBinder>& handle,

        const sp<IGraphicBufferProducer>& gbc,

        const sp<Layer>& lbc)

{

    // attach this layer to the client

    client->attachLayer(handle, lbc);



    // add this layer to the current state list

    {

        Mutex::Autolock _l(mStateLock);

        if (mCurrentState.layersSortedByZ.size() >= MAX_LAYERS) {

            return NO_MEMORY;

        }

        mCurrentState.layersSortedByZ.add(lbc);

        mGraphicBufferProducerList.add(IInterface::asBinder(gbc));

    }



    // attach this layer to the client

    client->attachLayer(handle, lbc);



    return NO_ERROR;

}



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

    Mutex::Autolock _l(mStateLock);

    ssize_t index = mCurrentState.layersSortedByZ.remove(layer);
@@ -2286,10 +2293,16 @@ status_t SurfaceFlinger::createLayer( 
            break;

    }



    if (result == NO_ERROR) {

        addClientLayer(client, *handle, *gbp, layer);

        setTransactionFlags(eTransactionNeeded);

    if (result != NO_ERROR) {

        return result;

    }



    result = addClientLayer(client, *handle, *gbp, layer);

    if (result != NO_ERROR) {

        return result;

    }



    setTransactionFlags(eTransactionNeeded);

    return result;

}

services/surfaceflinger/SurfaceFlinger.h

+3 −1
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ private: 
    // every half hour.

    enum { LOG_FRAME_STATS_PERIOD =  30*60*60 };



    static const size_t MAX_LAYERS = 4096;



    // We're reference counted, never destroy SurfaceFlinger directly

    virtual ~SurfaceFlinger();
@@ -305,7 +307,7 @@ private: 
    status_t removeLayer(const sp<Layer>& layer);



    // add a layer to SurfaceFlinger

    void addClientLayer(const sp<Client>& client,

    status_t addClientLayer(const sp<Client>& client,

            const sp<IBinder>& handle,

            const sp<IGraphicBufferProducer>& gbc,

            const sp<Layer>& lbc);