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

Commit 14c4d0da authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Use newly introduced hidl_handle. 

am: 403161ab

Change-Id: Ic5344ae123ef0c9b233eb31e6b9cd33be2d809fc
parents df6cb83d 403161ab

tests/bar/1.0/default/Bar.cpp

+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ Return<void> Bar::thisIsNew() { 
    return Void();

}



Return<void> Bar::expectNullHandle(const native_handle_t* h, const Abc& xyz, expectNullHandle_cb _hidl_cb) {

    ALOGI("SERVER(Bar) h = %p, xyz.z = %p", h, static_cast<void*>(xyz.z));

Return<void> Bar::expectNullHandle(const hidl_handle& h, const Abc& xyz, expectNullHandle_cb _hidl_cb) {

    ALOGI("SERVER(Bar) h = %p, xyz.z = %p", h.getNativeHandle(), xyz.z.getNativeHandle());

    _hidl_cb(h == nullptr, xyz.z == nullptr);

    return Void();

}

tests/bar/1.0/default/Bar.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct Bar : public IBar { 


    // Methods from ::android::hardware::tests::bar::V1_0::IBar follow.

    Return<void> thisIsNew()  override;

    Return<void> expectNullHandle(const native_handle_t* h, const Abc& xyz, expectNullHandle_cb _hidl_cb)  override;

    Return<void> expectNullHandle(const hidl_handle& h, const Abc& xyz, expectNullHandle_cb _hidl_cb)  override;



private:

    sp<IFoo> mFoo;

tests/foo/1.0/default/Foo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ Return<void> Foo::createMyHandle(createMyHandle_cb _hidl_cb) { 
}



Return<void> Foo::createHandles(uint32_t size, createHandles_cb _hidl_cb) {

    hidl_vec<const native_handle_t*> handles;

    hidl_vec<hidl_handle> handles;

    handles.resize(size);

    for(uint32_t i = 0; i < size; ++i) {

        createMyHandle([&](const MyHandle& h) {