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

Commit dcc14283 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Trims dead code"

parents f3c47f79 8cf4b61b

services/sensorservice/HidlSensorHalWrapper.cpp

+0 −23
Original line number Diff line number Diff line
@@ -374,29 +374,6 @@ void HidlSensorHalWrapper::writeWakeLockHandled(uint32_t count) { 
    }

}



void HidlSensorHalWrapper::onDynamicSensorsConnected(

        const std::vector<sensor_t>& dynamicSensorsAdded) {

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



    // Allocate a sensor_t structure for each dynamic sensor added and insert

    // it into the dictionary of connected dynamic sensors keyed by handle.

    for (size_t i = 0; i < dynamicSensorsAdded.size(); ++i) {

        const sensor_t& sensor = dynamicSensorsAdded[i];



        auto it = mConnectedDynamicSensors.find(sensor.handle);

        CHECK(it == mConnectedDynamicSensors.end());



        mConnectedDynamicSensors.insert(std::make_pair(sensor.handle, sensor));

    }



    mDynamicSensorsCv.notify_all();

}



void HidlSensorHalWrapper::onDynamicSensorsDisconnected(

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

    // TODO: Currently dynamic sensors do not seem to be removed

}



status_t HidlSensorHalWrapper::checkReturnAndGetStatus(const hardware::Return<Result>& ret) {

    checkReturn(ret);

    return (!ret.isOk()) ? DEAD_OBJECT : statusFromResult(ret);

services/sensorservice/HidlSensorHalWrapper.h

+0 −6
Original line number Diff line number Diff line
@@ -118,12 +118,6 @@ public: 
    virtual status_t configureDirectChannel(int32_t sensorHandle, int32_t channelHandle,

                                            const struct sensors_direct_cfg_t* config) override;



    virtual void onDynamicSensorsConnected(

            const std::vector<sensor_t>& dynamicSensorsAdded) override;



    virtual void onDynamicSensorsDisconnected(

            const std::vector<int32_t>& dynamicSensorHandlesRemoved) override;



    virtual void writeWakeLockHandled(uint32_t count) override;



private:

services/sensorservice/ISensorHalWrapper.h

+0 −5
Original line number Diff line number Diff line
@@ -94,11 +94,6 @@ public: 
    virtual status_t configureDirectChannel(int32_t sensorHandle, int32_t channelHandle,

                                            const struct sensors_direct_cfg_t *config) = 0;



    virtual void onDynamicSensorsConnected(const std::vector<sensor_t> &dynamicSensorsAdded) = 0;



    virtual void onDynamicSensorsDisconnected(

            const std::vector<int32_t> &dynamicSensorHandlesRemoved) = 0;



    virtual void writeWakeLockHandled(uint32_t count) = 0;



    std::atomic_bool mReconnecting = false;