Merge the android-9.0.0_r55 release tag
Android 9.0.0 Release 55 (6197209)
* tag 'android-9.0.0_r55':
Fix accidental implicit fallthroughs
Change-Id: I08d8c31484b620c67be00c47c5bca68afe5c31a0
diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.cpp b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
index a64d7a6..b5dc80a 100644
--- a/modules/sensors/dynamic_sensor/HidRawSensor.cpp
+++ b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
@@ -676,6 +676,7 @@
mFeatureInfo.type = SENSOR_TYPE_AMBIENT_TEMPERATURE;
mFeatureInfo.typeString = SENSOR_STRING_TYPE_AMBIENT_TEMPERATURE;
typeParsed = true;
+ break;
case SENSOR_TYPE_LIGHT:
mFeatureInfo.type = SENSOR_TYPE_LIGHT;
mFeatureInfo.typeString = SENSOR_STRING_TYPE_LIGHT;
@@ -917,12 +918,14 @@
periodMs = std::min(periodMs, static_cast<int64_t>(UINT16_MAX));
buffer[mReportIntervalOffset] = periodMs & 0xFF;
buffer[mReportIntervalOffset + 1] = (periodMs >> 8) & 0xFF;
+ break;
case sizeof(uint32_t):
periodMs = std::min(periodMs, static_cast<int64_t>(UINT32_MAX));
buffer[mReportIntervalOffset] = periodMs & 0xFF;
buffer[mReportIntervalOffset + 1] = (periodMs >> 8) & 0xFF;
buffer[mReportIntervalOffset + 2] = (periodMs >> 16) & 0xFF;
buffer[mReportIntervalOffset + 3] = (periodMs >> 24) & 0xFF;
+ break;
}
ok = device->setFeature(id, buffer);
}