commit ae2637364e673c695ffa0f6887a4a27b96b789ef
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 17 20:29:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 17 20:29:42 2019 +0000
tree d1dc843f2b0c55f7b847e00ffeeb8285800df508
parent 7b9d43b09e80125ad5fe33824c8e5190feb0b485
parent 0e2911ebe002f0747569b90a40e42e130f21026f

Merge "[hardware][interfaces][sensors] fix -Wreorder-init-list"

sensors/1.0/default/convert.cpp

diff --git a/sensors/1.0/default/convert.cpp b/sensors/1.0/default/convert.cpp
index 52f5e4f..53ceb0d 100644
--- a/sensors/1.0/default/convert.cpp
+++ b/sensors/1.0/default/convert.cpp
@@ -68,9 +68,9 @@
     typedef ::android::hardware::sensors::V1_0::MetaDataEventType MetaDataEventType;
 
     *dst = {
-        .sensorHandle = src.sensor,
-        .sensorType = (SensorType)src.type,
-        .timestamp = src.timestamp
+            .timestamp = src.timestamp,
+            .sensorHandle = src.sensor,
+            .sensorType = (SensorType)src.type,
     };
 
     switch (dst->sensorType) {

sensors/common/vts/utils/GrallocWrapper.cpp

diff --git a/sensors/common/vts/utils/GrallocWrapper.cpp b/sensors/common/vts/utils/GrallocWrapper.cpp
index 1cad913..e63faa2 100644
--- a/sensors/common/vts/utils/GrallocWrapper.cpp
+++ b/sensors/common/vts/utils/GrallocWrapper.cpp
@@ -147,8 +147,8 @@
             .width = size,
             .height = 1,
             .layerCount = 1,
-            .usage = kBufferUsage,
             .format = static_cast<decltype(descriptorInfo.format)>(PixelFormat::BLOB),
+            .usage = kBufferUsage,
     };
 
     BufferDescriptor descriptor;