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

Commit 65beac9b authored by Rocky Fang's avatar Rocky Fang
Browse files

Release dynamic sensor data at the end of process 

This makes sure that sensor service has full control of the life time of
the dynamic sensor data, and will not be affected by when the callback
is invoked.

Fixes: 329020894
Fixes: 337741176
Test: Connect a dynamic sensor to phone, rapidly turn on/off bluetooth to
emulate fast connection/disconnection of dynamic sensor. Not seeing
crash anymore

Change-Id: I6c9b4fa06e08dc1bb0b5e578ee2ec10b95fe84c3
parent 7b3c2125

services/sensorservice/SensorDevice.cpp

+12 −8
Original line number Diff line number Diff line
@@ -429,16 +429,20 @@ void SensorDevice::onDynamicSensorsConnected(const std::vector<sensor_t>& dynami 
}



void SensorDevice::onDynamicSensorsDisconnected(

        const std::vector<int32_t>& dynamicSensorHandlesRemoved) {

    if (sensorservice_flags::sensor_device_on_dynamic_sensor_disconnected()) {

        for (auto handle : dynamicSensorHandlesRemoved) {

        const std::vector<int32_t>& /*dynamicSensorHandlesRemoved*/) {

    // This function is currently a no-op has removing data in mConnectedDynamicSensors here will

    // cause a race condition between when this callback is invoked and when the dynamic sensor meta

    // event is processed by polling. The clean up should only happen after processing the meta

    // event. See the call stack of cleanupDisconnectedDynamicSensor.

}



void SensorDevice::cleanupDisconnectedDynamicSensor(int handle) {

    std::lock_guard<std::mutex> lock(mDynamicSensorsMutex);

    auto it = mConnectedDynamicSensors.find(handle);

    if (it != mConnectedDynamicSensors.end()) {

        mConnectedDynamicSensors.erase(it);

    }

}

    }

}



void SensorDevice::writeWakeLockHandled(uint32_t count) {

    if (mHalWrapper != nullptr && mHalWrapper->supportsMessageQueues()) {

services/sensorservice/SensorDevice.h

+8 −0
Original line number Diff line number Diff line
@@ -63,6 +63,14 @@ public: 
    std::vector<int32_t> getDynamicSensorHandles();



    void handleDynamicSensorConnection(int handle, bool connected);

    /**

     * Removes handle from connected dynamic sensor list. Note that this method must be called after

     * SensorService has done using sensor data.

     *

     * @param handle of the disconnected dynamic sensor.

     */

    void cleanupDisconnectedDynamicSensor(int handle);



    status_t initCheck() const;

    int getHalDeviceVersion() const;

services/sensorservice/SensorService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,7 @@ bool SensorService::threadLoop() { 
                } else {

                    int handle = mSensorEventBuffer[i].dynamic_sensor_meta.handle;

                    disconnectDynamicSensor(handle, activeConnections);

                    device.cleanupDisconnectedDynamicSensor(handle);

                }

            }

        }