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

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

Merge changes I763410d4,I665f52c1 

* changes:
  Remove unused variable in SensorService code
  Use std::vector in SensorDevice code
parents 35920eeb 2fd90a7e

services/sensorservice/SensorDevice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -338,8 +338,8 @@ void SensorDevice::reconnect() { 
    mReconnecting = false;

}



bool SensorDevice::sensorHandlesChanged(const Vector<sensor_t>& oldSensorList,

                                        const Vector<sensor_t>& newSensorList) {

bool SensorDevice::sensorHandlesChanged(const std::vector<sensor_t>& oldSensorList,

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

    bool didChange = false;



    if (oldSensorList.size() != newSensorList.size()) {

services/sensorservice/SensorDevice.h

+6 −5
Original line number Diff line number Diff line
@@ -32,9 +32,10 @@ 
#include <utils/String8.h>

#include <utils/Timers.h>



#include <string>

#include <unordered_map>

#include <algorithm> //std::max std::min

#include <unordered_map>

#include <string>

#include <vector>



#include "RingBuffer.h"
@@ -136,7 +137,7 @@ private: 
    friend class Singleton<SensorDevice>;



    sp<::android::hardware::sensors::V2_1::implementation::ISensorsWrapperBase> mSensors;

    Vector<sensor_t> mSensorList;

    std::vector<sensor_t> mSensorList;

    std::unordered_map<int32_t, sensor_t*> mConnectedDynamicSensors;



    // A bug in the Sensors HIDL spec which marks onDynamicSensorsConnected as oneway causes dynamic
@@ -233,8 +234,8 @@ private: 
    bool connectHidlService();

    void initializeSensorList();

    void reactivateSensors(const DefaultKeyedVector<int, Info>& previousActivations);

    static bool sensorHandlesChanged(const Vector<sensor_t>& oldSensorList,

                                     const Vector<sensor_t>& newSensorList);

    static bool sensorHandlesChanged(const std::vector<sensor_t>& oldSensorList,

                                     const std::vector<sensor_t>& newSensorList);

    static bool sensorIsEquivalent(const sensor_t& prevSensor, const sensor_t& newSensor);



    enum HalConnectionStatus {

services/sensorservice/SensorService.cpp

+2 −4
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ void SensorService::onFirstRef() { 
        sensor_t const* list;

        ssize_t count = dev.getSensorList(&list);

        if (count > 0) {

            ssize_t orientationIndex = -1;

            bool hasGyro = false, hasAccel = false, hasMag = false;

            uint32_t virtualSensorsNeeds =

                    (1<<SENSOR_TYPE_GRAVITY) |
@@ -183,9 +182,6 @@ void SensorService::onFirstRef() { 
                    case SENSOR_TYPE_MAGNETIC_FIELD:

                        hasMag = true;

                        break;

                    case SENSOR_TYPE_ORIENTATION:

                        orientationIndex = i;

                        break;

                    case SENSOR_TYPE_GYROSCOPE:

                    case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:

                        hasGyro = true;
@@ -201,6 +197,8 @@ void SensorService::onFirstRef() { 
                            virtualSensorsNeeds &= ~(1<<list[i].type);

                        }

                        break;

                    default:

                        break;

                }

                if (useThisSensor) {

                    if (list[i].type == SENSOR_TYPE_PROXIMITY) {