commit 282566950f4fbb99ccde67aa53c3ab8905072ea8
author Steven Moreland <smoreland@google.com> Wed Oct 16 15:52:11 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 16 15:52:11 2019 +0000
tree 9e90288e3591b28baf12d4fcf3a8d9f6b0220eda
parent 81ecad0bf95c3a1944d003924ffc1545d7b9e1e2
parent 46b5fea67c2e65a65e28209ba657acd7e45d3462

Merge changes from topic "ndk-vendor"

* changes:
  libbinder_ndk: fix vendor<->vendor transactions.
  Test double-loading libbinder.

libs/nativewindow/AHardwareBuffer.cpp

diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp
index 9bd3095..1ec73ce 100644
--- a/libs/nativewindow/AHardwareBuffer.cpp
+++ b/libs/nativewindow/AHardwareBuffer.cpp
@@ -266,10 +266,10 @@
 
     char buf[CMSG_SPACE(kFdBufferSize)];
     struct msghdr msg = {
-            .msg_control = buf,
-            .msg_controllen = sizeof(buf),
             .msg_iov = &iov[0],
             .msg_iovlen = 1,
+            .msg_control = buf,
+            .msg_controllen = sizeof(buf),
     };
 
     struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msg);
@@ -306,10 +306,10 @@
     iov[0].iov_len = kMessageBufferSize;
 
     struct msghdr msg = {
-            .msg_control = fdBuf,
-            .msg_controllen = sizeof(fdBuf),
             .msg_iov = &iov[0],
             .msg_iovlen = 1,
+            .msg_control = fdBuf,
+            .msg_controllen = sizeof(fdBuf),
     };
 
     int result;