Use newly introduced hidl_handle.

Bug: 32089785
Test: builds
Change-Id: I27c7d3945e1fe390661bf322987011a00fe9b3fe
This commit is contained in:
Martijn Coenen 2016-11-18 15:29:32 +01:00
parent 88fb149b8e
commit 403161ab73
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) {