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

* commit '6427e7190bbd83a29169e6ae4b5e3cff263f6937':
  Set DATA_INJECTION mode flag for sensors.
This commit is contained in:
Aravind Akella 2015-10-14 21:13:41 +00:00 committed by Android Git Automerger
commit 263b020b6e

View File

@ -245,6 +245,11 @@ Sensor::Sensor(struct sensor_t const* hwSensor, int halVersion)
break; 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. // For the newer HALs log errors if reporting mask flags are set incorrectly.
if (halVersion >= SENSORS_DEVICE_API_VERSION_1_3) { if (halVersion >= SENSORS_DEVICE_API_VERSION_1_3) {
// Wake-up flag is set here. // Wake-up flag is set here.