diff options
| author | 2016-04-16 04:43:37 +0000 | |
|---|---|---|
| committer | 2016-04-16 04:43:37 +0000 | |
| commit | 47babb84bcd2dcf4943687e33595ba58dc0dbe28 (patch) | |
| tree | 02f9ac14a84de80e30d45aca5a36af86f1c7215e /libs | |
| parent | 43dcac7500833c465c417805adc4693c60c3bb5e (diff) | |
| parent | 755c451c7861a029e26e5f16e319b629169e656d (diff) | |
Merge "sensorservice: switch to use sp<> in sensor list" into nyc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/Sensor.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp index 4b9a2abe96..0340d6bd6f 100644 --- a/libs/gui/Sensor.cpp +++ b/libs/gui/Sensor.cpp @@ -272,6 +272,11 @@ Sensor::Sensor(struct sensor_t const* hwSensor, int halVersion) break; } + // Set DYNAMIC_SENSOR_MASK and ADDITIONAL_INFO_MASK flag here. Compatible with HAL 1_3. + if (halVersion >= SENSORS_DEVICE_API_VERSION_1_3) { + mFlags |= (hwSensor->flags & (DYNAMIC_SENSOR_MASK | ADDITIONAL_INFO_MASK)); + } + // Set DATA_INJECTION flag here. Defined in HAL 1_4. if (halVersion >= SENSORS_DEVICE_API_VERSION_1_4) { mFlags |= (hwSensor->flags & DATA_INJECTION_MASK); |