commit ab94d71a948b9412f47241c6d2b1780e21f84677
author Hridya Valsaraju <hridya@google.com> Fri Mar 10 04:06:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 10 04:06:56 2017 +0000
tree 5027d54336d8826c8072a54d150d0a404b887c1b
parent 67091d1ebe4c824f2ca199f5b2a08508543d997f
parent 651b2962222a0a0a83a5209aaedf1b3d225a0561

Merge "Allow MQDescriptors with null native_handles to be passed over hwbinder" am: 499f210f05 am: a301e8d0e8
am: 651b296222

Change-Id: Ic0c6a70bcff8168d66a978504607cd6b217d9103

transport/include/hidl/HidlBinderSupport.h

diff --git a/transport/include/hidl/HidlBinderSupport.h b/transport/include/hidl/HidlBinderSupport.h
index ba11937..8b98021 100644
--- a/transport/include/hidl/HidlBinderSupport.h
+++ b/transport/include/hidl/HidlBinderSupport.h
@@ -147,7 +147,7 @@
     if (_hidl_err != ::android::OK) { return _hidl_err; }
 
     const native_handle_t *_hidl_mq_handle_ptr;
-   _hidl_err = parcel.readEmbeddedNativeHandle(
+   _hidl_err = parcel.readNullableEmbeddedNativeHandle(
             parentHandle,
             parentOffset + MQDescriptor<T, flavor>::kOffsetOfHandle,
             &_hidl_mq_handle_ptr);