am 2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev

* commit '2ac7405bda4f621f07cbcc0b562d16f7a9611c7b':
  Set DATA_INJECTION mode flag for sensors.
This commit is contained in:
Aravind Akella 2015-10-14 21:08:15 +00:00 committed by Android Git Automerger
commit 6427e7190b

View File

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