diff options
| author | 2015-10-14 21:20:00 +0000 | |
|---|---|---|
| committer | 2015-10-14 21:20:00 +0000 | |
| commit | 0221b4bd2d0443ec634d4264df32e7184a0e47c5 (patch) | |
| tree | c327d0bdd57e02f7d92e405aa442faedb50a7abf | |
| parent | eb873c89e98b18b6db755aac4040bc45e3b1d11c (diff) | |
| parent | 263b020b6eb442aa0f82860b34f68ab3f5a3971a (diff) | |
am 263b020b: am 6427e719: am 2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '263b020b6eb442aa0f82860b34f68ab3f5a3971a':
Set DATA_INJECTION mode flag for sensors.
| -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 4b3603ee12..235cbbdd76 100644 --- a/libs/gui/Sensor.cpp +++ b/libs/gui/Sensor.cpp @@ -245,6 +245,11 @@ Sensor::Sensor(struct sensor_t const* hwSensor, int halVersion) break; } + // Set DATA_INJECTION flag here. Defined in HAL 1_4. + if (halVersion >= SENSORS_DEVICE_API_VERSION_1_4) { + mFlags |= (hwSensor->flags & DATA_INJECTION_MASK); + } + // For the newer HALs log errors if reporting mask flags are set incorrectly. if (halVersion >= SENSORS_DEVICE_API_VERSION_1_3) { // Wake-up flag is set here. |