Merge "Fix accidental implicit fallthroughs" am: 5a651961b0

am: 85a465e3f9

Change-Id: Id1a4e311d7732ce302440f67c93669a4ba7f16d0

2 files changed, 3 insertions, 2 deletions

diff --git a/modules/sensors/dynamic_sensor/Android.bp b/modules/sensors/dynamic_sensor/Android.bp
index 489cdf4c..214d97cf 100644
--- a/modules/sensors/dynamic_sensor/Android.bp
+++ b/modules/sensors/dynamic_sensor/Android.bp
@@ -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: ["."],
 
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);
         }