summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2018-10-26 14:30:23 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-26 14:30:23 -0700
commit3eb72293ec9c4664eb9dfd98c9c99a6b32f30d8f (patch)
tree8b8fd852ee9071bf43f27f0a6d2328699eba8c87
parent410f6b0bf6ed94a1822042fcc8f474f5477461bb (diff)
parentb5b00f8f33a2b3e536f26ff0e43492cbc6365183 (diff)
downloaddevice_google_contexthub-3eb72293ec9c4664eb9dfd98c9c99a6b32f30d8f.tar.gz
device_google_contexthub-3eb72293ec9c4664eb9dfd98c9c99a6b32f30d8f.tar.bz2
device_google_contexthub-3eb72293ec9c4664eb9dfd98c9c99a6b32f30d8f.zip
Fix implicit-fallthrough warnings locally. am: bf044c805b am: e1cc59d443
am: b5b00f8f33 Change-Id: Ibc05875146fe28399bf58df35048ed7099176113
-rw-r--r--sensorhal/hubconnection.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/sensorhal/hubconnection.cpp b/sensorhal/hubconnection.cpp
index 6f387581..7d558bcb 100644
--- a/sensorhal/hubconnection.cpp
+++ b/sensorhal/hubconnection.cpp
@@ -771,6 +771,7 @@ void HubConnection::processSample(uint64_t timestamp, uint32_t type, uint32_t se
&& isSampleIntervalSatisfied(COMMS_SENSOR_MAG_UNCALIBRATED, timestamp)) {
++cnt;
}
+ break;
default:
break;
}
@@ -2195,15 +2196,14 @@ uint64_t HubConnection::rateLevelToDeviceSamplingPeriodNs(int handle, int rateLe
switch (rateLevel) {
case SENSOR_DIRECT_RATE_VERY_FAST:
- // No sensor support VERY_FAST, fall through
+ [[fallthrough]]; // No sensor support VERY_FAST, fall through
case SENSOR_DIRECT_RATE_FAST:
if (handle != COMMS_SENSOR_MAG && handle != COMMS_SENSOR_MAG_UNCALIBRATED) {
return 2500*1000; // 400Hz
}
- // fall through
+ [[fallthrough]];
case SENSOR_DIRECT_RATE_NORMAL:
return 20*1000*1000; // 50 Hz
- // fall through
default:
return INT64_MAX;
}