Use newly introduced hidl_handle. am: 403161ab73 am: 14c4d0da66

am: a01c7cd6d7

Change-Id: I1589ba4d11ffa9a8a2ef7049a763bb345498889e
This commit is contained in:
Martijn Coenen 2016-11-22 15:03:05 +00:00 committed by android-build-merger
commit 85e489167b
3 changed files with 4 additions and 4 deletions

View file

@ -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();
}

View file

@ -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;

View file

@ -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) {