commit 5a651961b08507cf4aa454114d888bfe39c7460e
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 07 21:28:12 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 07 21:28:12 2019 +0000
tree f01e2c629ff7c56feacf2bc58a0f33928b926d33
parent ce64df18175bf3999702c9b13925ab99ea66bb04
parent 377856d1bec154670ef1f703bb9fd7a45e92d906

Merge "Fix accidental implicit fallthroughs"

modules/sensors/dynamic_sensor/Android.bp

diff --git a/modules/sensors/dynamic_sensor/Android.bp b/modules/sensors/dynamic_sensor/Android.bp
index 489cdf4..214d97c 100644
--- a/modules/sensors/dynamic_sensor/Android.bp
+++ b/modules/sensors/dynamic_sensor/Android.bp
@@ -22,8 +22,6 @@
         "-Wall",
         "-Werror",
         "-Wextra",
-        // Allow implicit fallthroughs in HidRawSensor.cpp until they are fixed.
-        "-Wno-error=implicit-fallthrough",
     ],
     export_include_dirs: ["."],
 

modules/sensors/dynamic_sensor/HidRawSensor.cpp

diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.cpp b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
index ae6ef47..4668412 100644
--- a/modules/sensors/dynamic_sensor/HidRawSensor.cpp
+++ b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
@@ -676,6 +676,7 @@
                     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 @@
                     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);
         }