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

Commit 2b98aeb9 authored by Brian Duddie's avatar Brian Duddie Committed by Automerger Merge Worker
Browse files

Restore sensor flush behavior for disabled clients am: 24f2b4c0 am: 3468420b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18191639



Change-Id: I1b5fbc2d7fea6ee1677d395f5efdf0c2eab9d0b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fc2e91b 3468420b

services/sensorservice/SensorDevice.cpp

+10 −1
Original line number Original line Diff line number Diff line
@@ -612,8 +612,10 @@ int SensorDevice::getHalDeviceVersion() const { 
    return SENSORS_DEVICE_API_VERSION_1_4;

    return SENSORS_DEVICE_API_VERSION_1_4;

}

}





status_t SensorDevice::flush(void* /*ident*/, int handle) {

status_t SensorDevice::flush(void* ident, int handle) {

    if (mHalWrapper == nullptr) return NO_INIT;

    if (mHalWrapper == nullptr) return NO_INIT;

    if (isClientDisabled(ident)) return INVALID_OPERATION;

    ALOGD_IF(DEBUG_CONNECTIONS, "\t>>> actuating h/w flush %d", handle);

    return mHalWrapper->flush(handle);

    return mHalWrapper->flush(handle);

}

}
@@ -754,6 +756,13 @@ void SensorDevice::disableAllSensors() { 




status_t SensorDevice::injectSensorData(const sensors_event_t* injected_sensor_event) {

status_t SensorDevice::injectSensorData(const sensors_event_t* injected_sensor_event) {

    if (mHalWrapper == nullptr) return NO_INIT;

    if (mHalWrapper == nullptr) return NO_INIT;

    ALOGD_IF(DEBUG_CONNECTIONS,

             "sensor_event handle=%d ts=%" PRId64 " data=%.2f, %.2f, %.2f %.2f %.2f %.2f",

             injected_sensor_event->sensor, injected_sensor_event->timestamp,

             injected_sensor_event->data[0], injected_sensor_event->data[1],

             injected_sensor_event->data[2], injected_sensor_event->data[3],

             injected_sensor_event->data[4], injected_sensor_event->data[5]);



    return mHalWrapper->injectSensorData(injected_sensor_event);

    return mHalWrapper->injectSensorData(injected_sensor_event);

}

}