Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30480ac9 authored by Aravind Akella's avatar Aravind Akella Committed by Android Git Automerger
Browse files

am fca43392: Merge "Fix for AOSP fusion sensors not handling multiple clients... 

am fca43392: Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev

* commit 'fca43392':
  Fix for AOSP fusion sensors not handling multiple clients correctly.
parents 47e300c4 fca43392

services/sensorservice/CorrectedGyroSensor.cpp

+4 −4
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ bool CorrectedGyroSensor::process(sensors_event_t* outEvent, 
}



status_t CorrectedGyroSensor::activate(void* ident, bool enabled) {

    mSensorDevice.activate(this, mGyro.getHandle(), enabled);

    return mSensorFusion.activate(this, enabled);

    mSensorDevice.activate(ident, mGyro.getHandle(), enabled);

    return mSensorFusion.activate(ident, enabled);

}



status_t CorrectedGyroSensor::setDelay(void* ident, int handle, int64_t ns) {

    mSensorDevice.setDelay(this, mGyro.getHandle(), ns);

    return mSensorFusion.setDelay(this, ns);

    mSensorDevice.setDelay(ident, mGyro.getHandle(), ns);

    return mSensorFusion.setDelay(ident, ns);

}



Sensor CorrectedGyroSensor::getSensor() const {

services/sensorservice/GravitySensor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -67,11 +67,11 @@ bool GravitySensor::process(sensors_event_t* outEvent, 
}



status_t GravitySensor::activate(void* ident, bool enabled) {

    return mSensorFusion.activate(this, enabled);

    return mSensorFusion.activate(ident, enabled);

}



status_t GravitySensor::setDelay(void* ident, int handle, int64_t ns) {

    return mSensorFusion.setDelay(this, ns);

    return mSensorFusion.setDelay(ident, ns);

}



Sensor GravitySensor::getSensor() const {

services/sensorservice/LinearAccelerationSensor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ bool LinearAccelerationSensor::process(sensors_event_t* outEvent, 
}



status_t LinearAccelerationSensor::activate(void* ident, bool enabled) {

    return mGravitySensor.activate(this, enabled);

    return mGravitySensor.activate(ident, enabled);

}



status_t LinearAccelerationSensor::setDelay(void* ident, int handle, int64_t ns) {

    return mGravitySensor.setDelay(this, handle, ns);

    return mGravitySensor.setDelay(ident, handle, ns);

}



Sensor LinearAccelerationSensor::getSensor() const {

services/sensorservice/OrientationSensor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@ bool OrientationSensor::process(sensors_event_t* outEvent, 
}



status_t OrientationSensor::activate(void* ident, bool enabled) {

    return mSensorFusion.activate(this, enabled);

    return mSensorFusion.activate(ident, enabled);

}



status_t OrientationSensor::setDelay(void* ident, int handle, int64_t ns) {

    return mSensorFusion.setDelay(this, ns);

    return mSensorFusion.setDelay(ident, ns);

}



Sensor OrientationSensor::getSensor() const {

services/sensorservice/RotationVectorSensor.cpp

+4 −4
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ bool RotationVectorSensor::process(sensors_event_t* outEvent, 
}



status_t RotationVectorSensor::activate(void* ident, bool enabled) {

    return mSensorFusion.activate(this, enabled);

    return mSensorFusion.activate(ident, enabled);

}



status_t RotationVectorSensor::setDelay(void* ident, int handle, int64_t ns) {

    return mSensorFusion.setDelay(this, ns);

    return mSensorFusion.setDelay(ident, ns);

}



Sensor RotationVectorSensor::getSensor() const {
@@ -102,11 +102,11 @@ bool GyroDriftSensor::process(sensors_event_t* outEvent, 
}



status_t GyroDriftSensor::activate(void* ident, bool enabled) {

    return mSensorFusion.activate(this, enabled);

    return mSensorFusion.activate(ident, enabled);

}



status_t GyroDriftSensor::setDelay(void* ident, int handle, int64_t ns) {

    return mSensorFusion.setDelay(this, ns);

    return mSensorFusion.setDelay(ident, ns);

}



Sensor GyroDriftSensor::getSensor() const {