commit 2ac7405bda4f621f07cbcc0b562d16f7a9611c7b
author Aravind Akella <aakella@google.com> Wed Oct 14 21:03:07 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 14 21:03:07 2015 +0000
tree 1e84f71a43565025c885ad562b73bc6f87500cf1
parent 312d7555cb71ce7fb73bc758b9e30653e223b2f3
parent f9b7f8548eb95f2c387c4c2331acfaa04b6099b8

Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev

libs/gui/Sensor.cpp

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 @@
         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.