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

Commit bff22906 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: Removed createScopedConnection."

parents 73309669 b89ea9d9

libs/gui/ISurfaceComposer.cpp

+0 −18
Original line number Diff line number Diff line
@@ -63,16 +63,6 @@ public: 
        return interface_cast<ISurfaceComposerClient>(reply.readStrongBinder());

    }



    virtual sp<ISurfaceComposerClient> createScopedConnection(

            const sp<IGraphicBufferProducer>& parent)

    {

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        data.writeStrongBinder(IInterface::asBinder(parent));

        remote()->transact(BnSurfaceComposer::CREATE_SCOPED_CONNECTION, data, &reply);

        return interface_cast<ISurfaceComposerClient>(reply.readStrongBinder());

    }



    virtual void setTransactionState(const Vector<ComposerState>& state,

                                     const Vector<DisplayState>& displays, uint32_t flags,

                                     const sp<IBinder>& applyToken,
@@ -711,14 +701,6 @@ status_t BnSurfaceComposer::onTransact( 
            reply->writeStrongBinder(b);

            return NO_ERROR;

        }

        case CREATE_SCOPED_CONNECTION: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            sp<IGraphicBufferProducer> bufferProducer =

                interface_cast<IGraphicBufferProducer>(data.readStrongBinder());

            sp<IBinder> b = IInterface::asBinder(createScopedConnection(bufferProducer));

            reply->writeStrongBinder(b);

            return NO_ERROR;

        }

        case SET_TRANSACTION_STATE: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

libs/gui/SurfaceComposerClient.cpp

+1 −8
Original line number Diff line number Diff line
@@ -910,11 +910,6 @@ SurfaceComposerClient::SurfaceComposerClient() 
{

}



SurfaceComposerClient::SurfaceComposerClient(const sp<IGraphicBufferProducer>& root)

    : mStatus(NO_INIT), mParent(root)

{

}



SurfaceComposerClient::SurfaceComposerClient(const sp<ISurfaceComposerClient>& client)

    : mStatus(NO_ERROR), mClient(client)

{
@@ -923,10 +918,8 @@ SurfaceComposerClient::SurfaceComposerClient(const sp<ISurfaceComposerClient>& c 
void SurfaceComposerClient::onFirstRef() {

    sp<ISurfaceComposer> sf(ComposerService::getComposerService());

    if (sf != nullptr && mStatus == NO_INIT) {

        auto rootProducer = mParent.promote();

        sp<ISurfaceComposerClient> conn;

        conn = (rootProducer != nullptr) ? sf->createScopedConnection(rootProducer) :

                sf->createConnection();

        conn = sf->createConnection();

        if (conn != nullptr) {

            mClient = conn;

            mStatus = NO_ERROR;

libs/gui/SurfaceControl.cpp

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ SurfaceControl::SurfaceControl( 
{

}



SurfaceControl::SurfaceControl(const sp<SurfaceControl>& other) {

    mClient = other->mClient;

    mHandle = other->mHandle;

    mGraphicBufferProducer = other->mGraphicBufferProducer;

    mOwned = false;

}



SurfaceControl::~SurfaceControl()

{

    destroy();

libs/gui/include/gui/ISurfaceComposer.h

+2 −14
Original line number Diff line number Diff line
@@ -87,22 +87,11 @@ public: 
        eVsyncSourceSurfaceFlinger = 1

    };



    /* create connection with surface flinger, requires

     * ACCESS_SURFACE_FLINGER permission

    /* 

     * Create a connection with SurfaceFlinger.

     */

    virtual sp<ISurfaceComposerClient> createConnection() = 0;



    /** create a scoped connection with surface flinger.

     * Surfaces produced with this connection will act

     * as children of the passed in GBP. That is to say

     * SurfaceFlinger will draw them relative and confined to

     * drawing of buffers from the layer associated with parent.

     * As this is graphically equivalent in reach to just drawing

     * pixels into the parent buffers, it requires no special permission.

     */

    virtual sp<ISurfaceComposerClient> createScopedConnection(

            const sp<IGraphicBufferProducer>& parent) = 0;



    /* return an IDisplayEventConnection */

    virtual sp<IDisplayEventConnection> createDisplayEventConnection(

            VsyncSource vsyncSource = eVsyncSourceApp) = 0;
@@ -356,7 +345,6 @@ public: 
        ENABLE_VSYNC_INJECTIONS,

        INJECT_VSYNC,

        GET_LAYER_DEBUG_INFO,

        CREATE_SCOPED_CONNECTION,

        GET_COMPOSITION_PREFERENCE,

        GET_COLOR_MANAGEMENT,

        GET_DISPLAYED_CONTENT_SAMPLING_ATTRIBUTES,

libs/gui/include/gui/SurfaceComposerClient.h

+0 −2
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ class SurfaceComposerClient : public RefBase 
public:

                SurfaceComposerClient();

                SurfaceComposerClient(const sp<ISurfaceComposerClient>& client);

                SurfaceComposerClient(const sp<IGraphicBufferProducer>& parent);

    virtual     ~SurfaceComposerClient();



    // Always make sure we could initialize
@@ -402,7 +401,6 @@ private: 
    mutable     Mutex                       mLock;

                status_t                    mStatus;

                sp<ISurfaceComposerClient>  mClient;

                wp<IGraphicBufferProducer>  mParent;

};



// ---------------------------------------------------------------------------