diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:31:37 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:31:37 +0000 |
| commit | 68af54f64bb494f3dbb8de90f91279cd3ff2f9ae (patch) | |
| tree | afd4ab52bea1d1a59baab68207ddcc6a30fe62cd | |
| parent | 94f0d1a30f6cfaf8fd98abb18dd67c5c1d07cdc2 (diff) | |
| parent | 738edce4aceeb8fbbcd80deceef8f5a810cf50a1 (diff) | |
| download | libhardware-android10-mainline-resolv-release.tar.gz | |
Snap for 6001391 from 738edce4aceeb8fbbcd80deceef8f5a810cf50a1 to qt-aml-resolv-releaseandroid-mainline-10.0.0_r8android10-mainline-resolv-release
Change-Id: I3ba193b114401f9dbd52f77bd37672b7abcc0a8d
| -rw-r--r-- | modules/audio_remote_submix/Android.bp | 4 | ||||
| -rw-r--r-- | modules/sensors/dynamic_sensor/Android.bp | 2 | ||||
| -rw-r--r-- | modules/sensors/dynamic_sensor/HidRawSensor.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/modules/audio_remote_submix/Android.bp b/modules/audio_remote_submix/Android.bp index f7b5c143..95234380 100644 --- a/modules/audio_remote_submix/Android.bp +++ b/modules/audio_remote_submix/Android.bp @@ -20,10 +20,10 @@ cc_library_shared { shared_libs: [ "liblog", "libcutils", - "libutils", + "libmedia_helper", "libnbaio_mono", + "libutils", ], - static_libs: ["libmedia_helper"], cflags: ["-Wno-unused-parameter"], 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); } |