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

Commit dbb37e53 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "bufferpool2.0: apply hidl interface update"

parents a87a219b 1cb0ccb5

media/bufferpool/2.0/Accessor.cpp

+9 −3
Original line number Diff line number Diff line
@@ -117,14 +117,20 @@ sp<ConnectionDeathRecipient> Accessor::getConnectionDeathRecipient() { 
Return<void> Accessor::connect(connect_cb _hidl_cb) {

    sp<Connection> connection;

    ConnectionId connectionId;

    const QueueDescriptor* fmqDesc;

    const StatusDescriptor* fmqDesc;



    ResultStatus status = connect(&connection, &connectionId, &fmqDesc, false);

    if (status == ResultStatus::OK) {

        _hidl_cb(status, connection, connectionId, *fmqDesc);

        _hidl_cb(status, connection, connectionId, *fmqDesc,

                 android::hardware::MQDescriptorSync<BufferInvalidationMessage>(

                         std::vector<android::hardware::GrantorDescriptor>(),

                         nullptr /* nhandle */, 0 /* size */));

    } else {

        _hidl_cb(status, nullptr, -1LL,

                 android::hardware::MQDescriptorSync<BufferStatusMessage>(

                         std::vector<android::hardware::GrantorDescriptor>(),

                         nullptr /* nhandle */, 0 /* size */),

                 android::hardware::MQDescriptorSync<BufferInvalidationMessage>(

                         std::vector<android::hardware::GrantorDescriptor>(),

                         nullptr /* nhandle */, 0 /* size */));

    }
@@ -162,7 +168,7 @@ ResultStatus Accessor::fetch( 


ResultStatus Accessor::connect(

        sp<Connection> *connection, ConnectionId *pConnectionId,

        const QueueDescriptor** fmqDescPtr, bool local) {

        const StatusDescriptor** fmqDescPtr, bool local) {

    if (mImpl) {

        ResultStatus status = mImpl->connect(this, connection, pConnectionId, fmqDescPtr);

        if (!local && status == ResultStatus::OK) {

media/bufferpool/2.0/Accessor.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ struct Accessor : public IAccessor { 
     */

    ResultStatus connect(

            sp<Connection> *connection, ConnectionId *pConnectionId,

            const QueueDescriptor** fmqDescPtr, bool local);

            const StatusDescriptor** fmqDescPtr, bool local);



    /**

     * Closes the specified connection to the client.

media/bufferpool/2.0/AccessorImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ Accessor::Impl::~Impl() { 


ResultStatus Accessor::Impl::connect(

        const sp<Accessor> &accessor, sp<Connection> *connection,

        ConnectionId *pConnectionId, const QueueDescriptor** fmqDescPtr) {

        ConnectionId *pConnectionId, const StatusDescriptor** fmqDescPtr) {

    sp<Connection> newConnection = new Connection();

    ResultStatus status = ResultStatus::CRITICAL_ERROR;

    {

media/bufferpool/2.0/AccessorImpl.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public: 


    ResultStatus connect(

            const sp<Accessor> &accessor, sp<Connection> *connection,

            ConnectionId *pConnectionId, const QueueDescriptor** fmqDescPtr);

            ConnectionId *pConnectionId, const StatusDescriptor** fmqDescPtr);



    ResultStatus close(ConnectionId connectionId);

media/bufferpool/2.0/BufferPoolClient.cpp

+4 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ public: 
BufferPoolClient::Impl::Impl(const sp<Accessor> &accessor)

    : mLocal(true), mValid(false), mAccessor(accessor), mSeqId(0),

      mLastEvictCacheUs(getTimestampNow()) {

    const QueueDescriptor *fmqDesc;

    const StatusDescriptor *fmqDesc;

    ResultStatus status = accessor->connect(

            &mLocalConnection, &mConnectionId, &fmqDesc, true);

    if (status == ResultStatus::OK) {
@@ -269,7 +269,9 @@ BufferPoolClient::Impl::Impl(const sp<IAccessor> &accessor) 
    Return<void> transResult = accessor->connect(

            [&valid, &outConnection, &id, &outChannel]

            (ResultStatus status, sp<IConnection> connection,

             ConnectionId connectionId, const QueueDescriptor& desc) {

             ConnectionId connectionId, const StatusDescriptor& desc,

             const InvalidationDescriptor& invDesc) {

                (void) invDesc;

                if (status == ResultStatus::OK) {

                    outConnection = connection;

                    id = connectionId;