diff options
| author | Aravind Akella <aakella@google.com> | 2014-09-12 05:36:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 05:36:58 +0000 |
| commit | 3d0daa57f5f180418fdecbf06f6a5a41e566f6d9 (patch) | |
| tree | f9d168520895cb2d374064335e445f986f99e6e6 /libs/gui | |
| parent | c16acacd6dd6540766e733da6aa86eda58d41f97 (diff) | |
| parent | 8493b79e1cff92450076ca7450c4bf4e434a6816 (diff) | |
| download | frameworks_native-3d0daa57f5f180418fdecbf06f6a5a41e566f6d9.zip frameworks_native-3d0daa57f5f180418fdecbf06f6a5a41e566f6d9.tar.gz frameworks_native-3d0daa57f5f180418fdecbf06f6a5a41e566f6d9.tar.bz2 | |
am 8493b79e: SensorService fixes
* commit '8493b79e1cff92450076ca7450c4bf4e434a6816':
SensorService fixes
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/Sensor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp index bae05a8..b4291bb 100644 --- a/libs/gui/Sensor.cpp +++ b/libs/gui/Sensor.cpp @@ -56,7 +56,7 @@ Sensor::Sensor(struct sensor_t const* hwSensor, int halVersion) // Set fifo event count zero for older devices which do not support batching. Fused // sensors also have their fifo counts set to zero. - if (halVersion >= SENSORS_DEVICE_API_VERSION_1_1) { + if (halVersion > SENSORS_DEVICE_API_VERSION_1_0) { mFifoReservedEventCount = hwSensor->fifoReservedEventCount; mFifoMaxEventCount = hwSensor->fifoMaxEventCount; } else { @@ -206,10 +206,10 @@ Sensor::Sensor(struct sensor_t const* hwSensor, int halVersion) break; default: // Only pipe the stringType, requiredPermission and flags for custom sensors. - if (halVersion >= SENSORS_DEVICE_API_VERSION_1_2 && hwSensor->stringType) { + if (halVersion > SENSORS_DEVICE_API_VERSION_1_0 && hwSensor->stringType) { mStringType = hwSensor->stringType; } - if (halVersion >= SENSORS_DEVICE_API_VERSION_1_2 && hwSensor->requiredPermission) { + if (halVersion > SENSORS_DEVICE_API_VERSION_1_0 && hwSensor->requiredPermission) { mRequiredPermission = hwSensor->requiredPermission; } |