tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix accidental implicit fallthroughs"

Browse source
This commit is contained in:
Treehugger Robot 2019-11-07 21:28:12 +00:00 committed by Gerrit Code Review
commit 5a651961b0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/sensors/dynamic_sensor/Android.bp
View file

@ -22,8 +22,6 @@ cc_defaults {
"-Wall",
"-Werror",
"-Wextra",
// Allow implicit fallthroughs in HidRawSensor.cpp until they are fixed.
"-Wno-error=implicit-fallthrough",
],
export_include_dirs: ["."],

3
modules/sensors/dynamic_sensor/HidRawSensor.cpp
View file

@ -676,6 +676,7 @@ bool HidRawSensor::detectAndroidCustomSensor(const std::string &description) {
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 @@ int HidRawSensor::batch(int64_t samplingPeriod, int64_t batchingPeriod) {
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);
}