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

Commit 96819dca authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Zero hidl-generated structs (bufferpool)" into qt-dev 

am: f7a11d93

Change-Id: I345ac4a84f16b2f492bc9176a5c1d4adf85dc8df
parents c8494f64 f7a11d93

media/bufferpool/1.0/Connection.cpp

+10 −2
Original line number Diff line number Diff line
@@ -32,14 +32,22 @@ Return<void> Connection::fetch(uint64_t transactionId, uint32_t bufferId, fetch_ 
            status = mAccessor->fetch(

                    mConnectionId, transactionId, bufferId, &handle);

            if (status == ResultStatus::OK) {

                _hidl_cb(status, Buffer{bufferId, handle});

                Buffer buffer = {};

                buffer.id = bufferId;

                buffer.buffer = handle;

                _hidl_cb(status, buffer);

                return Void();

            }

        } else {

            mAccessor->cleanUp(false);

        }

    }

    _hidl_cb(status, Buffer{0, nullptr});



    Buffer buffer = {};

    buffer.id = 0;

    buffer.buffer = nullptr;



    _hidl_cb(status, buffer);

    return Void();

}

media/bufferpool/2.0/Connection.cpp

+10 −2
Original line number Diff line number Diff line
@@ -32,14 +32,22 @@ Return<void> Connection::fetch(uint64_t transactionId, uint32_t bufferId, fetch_ 
            status = mAccessor->fetch(

                    mConnectionId, transactionId, bufferId, &handle);

            if (status == ResultStatus::OK) {

                _hidl_cb(status, Buffer{bufferId, handle});

                Buffer buffer = {};

                buffer.id = bufferId;

                buffer.buffer = handle;

                _hidl_cb(status, buffer);

                return Void();

            }

        } else {

            mAccessor->cleanUp(false);

        }

    }

    _hidl_cb(status, Buffer{0, nullptr});



    Buffer buffer = {};

    buffer.id = 0;

    buffer.buffer = nullptr;



    _hidl_cb(status, buffer);

    return Void();

}