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

Commit 4f1dd8a0 authored by Arthur Ishiguro's avatar Arthur Ishiguro
Browse files

Use std::vector in SensorDevice code 

Bug: 195593357
Test: Compile, verify CTS pass
Change-Id: I665f52c1528fb0c9d9f4cd2368008773b06a65f1
parent a0b0a068

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 {