diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:07:16 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:07:16 -0800 |
| commit | 4951bcc16e99daafc44581e4222f012f9d419ae0 (patch) | |
| tree | 7be00878227a20b4610649a7d455db2d9cb3463c /libs/gui | |
| parent | 53602ffde5527c476a1d7d39da12ecd7f58917f4 (diff) | |
| parent | a78c2e65e13cace4fdbb0295beca5b11de9fde06 (diff) | |
| download | frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.zip frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.gz frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 3
Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
Diffstat (limited to 'libs/gui')
| -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 4b3603e..235cbbd 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. |