commit 651b2962222a0a0a83a5209aaedf1b3d225a0561
author Hridya Valsaraju <hridya@google.com> Fri Mar 10 04:03:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 10 04:03:59 2017 +0000
tree d8346c020884aefc77ee9729ee274d59935f8e5b
parent e4f17343835c21dba20c3afaa7eecbabff038894
parent a301e8d0e8910f29c524b774deff4359b88e15ae

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

Change-Id: I3a8a083f4d414e8ea102ee986fedec78a8abfdaf

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