diff options
author | Colin Cross <ccross@android.com> | 2019-11-01 16:34:30 -0700 |
---|---|---|
committer | Manjae Park <manjaepark@google.com> | 2019-12-16 12:39:51 -0800 |
commit | e5cea87786cc98f5cf191b0c61c0b000d1ec790d (patch) | |
tree | 1f4de7fa3b4da2c31b1c1fb7d8c06940213e5385 | |
parent | 233947c19821f78d3e1ea193b2cf893b7ebcdf2c (diff) | |
download | libhardware-security-oc-release.tar.gz |
Fix accidental implicit fallthroughsandroid-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43security-oc-release
-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 fbeb4fc1397c0a193615c30c4ffc1c029b7ad69a)
-rw-r--r-- | modules/sensors/dynamic_sensor/HidRawSensor.cpp | 3 |
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); } |