libhardware: fix -Wreorder-init-list
C++20 is stricter about member ordering in designated initializers than
C99.
Bug: 139945549
Test: mm
Change-Id: I045da46821280e720286a25a0c96b5750d1ad05e
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
diff --git a/modules/sensors/dynamic_sensor/DynamicSensorManager.cpp b/modules/sensors/dynamic_sensor/DynamicSensorManager.cpp
index b634052..37b4313 100644
--- a/modules/sensors/dynamic_sensor/DynamicSensorManager.cpp
+++ b/modules/sensors/dynamic_sensor/DynamicSensorManager.cpp
@@ -111,8 +111,8 @@
if (handle == mHandleRange.first) {
// submit a flush complete here
static const sensors_event_t event = {
- .type = SENSOR_TYPE_META_DATA,
.sensor = mHandleRange.first,
+ .type = SENSOR_TYPE_META_DATA,
.timestamp = TIMESTAMP_AUTO_FILL, // timestamp will be filled at dispatcher
};
submitEvent(nullptr, event);
diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.cpp b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
index 4668412..f3c8a27 100644
--- a/modules/sensors/dynamic_sensor/HidRawSensor.cpp
+++ b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
@@ -177,13 +177,13 @@
}
ReportTranslateRecord record = {
- .minValue = digest.minRaw,
+ .type = TYPE_FLOAT,
.maxValue = digest.maxRaw,
+ .minValue = digest.minRaw,
.byteOffset = digest.bitOffset / 8,
.byteSize = digest.bitSize / 8,
.a = digest.a,
.b = digest.b,
- .type = TYPE_FLOAT
};
// keep track of range and resolution
range = std::max(std::max(std::abs((digest.maxRaw + digest.b) * digest.a),
@@ -250,12 +250,12 @@
}
ReportTranslateRecord record = {
- .minValue = quat.minRaw,
+ .type = TYPE_FLOAT,
.maxValue = quat.maxRaw,
+ .minValue = quat.minRaw,
.byteOffset = quat.bitOffset / 8,
.byteSize = quat.bitSize / 8,
.b = quat.b,
- .type = TYPE_FLOAT,
};
// Android X Y Z maps to HID X -Z Y
@@ -351,10 +351,10 @@
mFeatureInfo.reportModeFlag = SENSOR_FLAG_CONTINUOUS_MODE;
ReportTranslateRecord record = {
- .minValue = reportX.minRaw,
+ .type = TYPE_FLOAT,
.maxValue = reportX.maxRaw,
+ .minValue = reportX.minRaw,
.byteSize = reportX.bitSize / 8,
- .type = TYPE_FLOAT
};
// Reorder and swap axis
diff --git a/modules/sensors/dynamic_sensor/HidUtils/HidParser.cpp b/modules/sensors/dynamic_sensor/HidUtils/HidParser.cpp
index 5efaf65..264f13c 100644
--- a/modules/sensors/dynamic_sensor/HidUtils/HidParser.cpp
+++ b/modules/sensors/dynamic_sensor/HidUtils/HidParser.cpp
@@ -231,9 +231,9 @@
// template
ReportPacket packet = {
+ .bitSize = 0,
.type = type,
.id = id,
- .bitSize = 0
};
for (const auto &r : reports) {
@@ -252,10 +252,10 @@
.maxRaw = logical.second,
.a = scale,
.b = offset,
+ .unit = r.getUnit(),
.bitOffset = packet.bitSize,
.bitSize = r.getSize(),
.count = r.getCount(),
- .unit = r.getUnit(),
};
packet.reports.push_back(digest);
packet.bitSize += digest.bitSize * digest.count;