summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-04 16:19:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-04 16:19:54 +0000
commit8dbb6dee8f37b1b61261b6cdd2bf08da28dcd8f6 (patch)
treece69c96d1da077ad8275e63bb7de0f77c94f6c69
parentbc5b610f7b9c40858c8d6d40f58069f5ea130762 (diff)
parent876dd34376df6dd2914f1facf963aedc06395f26 (diff)
downloadlibhardware-8dbb6dee8f37b1b61261b6cdd2bf08da28dcd8f6.tar.gz
Fix accidental implicit fallthroughs am: e43fe9ddf2 am: 876dd34376
Change-Id: I38046073df4d71624597a997367fb82fc5cecbf0
-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 ae6ef473..46684128 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);
}