commit 846c39f5cb23d5f7e21aa6e4baa7febea5df031f
author Nick Desaulniers <ndesaulniers@google.com> Tue Oct 15 21:45:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 15 21:45:37 2019 -0700
tree c311ca3f8a2b40e29a3451c8e717e46ff40d696d
parent 0d9cdd28f817def200ab627c6124b4c43ecbb3b1
parent 81ecad0bf95c3a1944d003924ffc1545d7b9e1e2

Merge "[nativewindow] fix -Wreorder-init-list"
am: 81ecad0bf9

Change-Id: Iee57f9ff33142418b163f06ecc450a978fddfa54

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;