summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-11-01 16:34:30 -0700
committerManjae Park <manjaepark@google.com>2019-12-16 12:13:54 -0800
commit99f49b759d52a9f084e571357811a01ef041348f (patch)
tree0dbf4ce01f67fc302488d8718bc6ed85138adac8
parent12dd5a3dc35bb6ae7dd8ee29f91b34e90034453b (diff)
downloadlibhardware-security-oc-mr1-release.tar.gz
-Wimplicit-fallthrough was printing warnings for these, they look like real errors. Fix them and re-enable the error. Bug: 144040966 Test: treehugger Merged-In: I818e18a995760f17b85b4c72ee577e531fa2a601 Change-Id: I818e18a995760f17b85b4c72ee577e531fa2a601 (cherry picked from commit e38c5a976c09d9910f40dbfba61f1c2a7eeef1c9)
-rw-r--r--modules/sensors/dynamic_sensor/HidRawSensor.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.cpp b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
index a64d7a68..b5dc80ad 100644
--- a/modules/sensors/dynamic_sensor/HidRawSensor.cpp
+++ b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
@@ -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);
}