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

Commit 68ff807e authored by Peng Xu's avatar Peng Xu Committed by android-build-merger
Browse files

Merge "Fix google-explicit-constructor warnings in sensorservice." am:... 

Merge "Fix google-explicit-constructor warnings in sensorservice." am: 215d7ab7 am: 341d12b1 am: b6365afd
am: a0514298

Change-Id: I0f4f1858236a253fb9f91304eda89f74c789bae8
parents 2c238fc2 a0514298

services/sensorservice/RecentEventLogger.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ namespace SensorServiceUtil { 
// behavior.

// behavior.

class RecentEventLogger : public Dumpable {

class RecentEventLogger : public Dumpable {

public:

public:

    RecentEventLogger(int sensorType);

    explicit RecentEventLogger(int sensorType);

    void addEvent(const sensors_event_t& event);

    void addEvent(const sensors_event_t& event);

    bool populateLastEvent(sensors_event_t *event) const;

    bool populateLastEvent(sensors_event_t *event) const;

    bool isEmpty() const;

    bool isEmpty() const;
@@ -47,7 +47,7 @@ public: 




protected:

protected:

    struct SensorEventLog {

    struct SensorEventLog {

        SensorEventLog(const sensors_event_t& e);

        explicit SensorEventLog(const sensors_event_t& e);

        timespec mWallTime;

        timespec mWallTime;

        sensors_event_t mEvent;

        sensors_event_t mEvent;

    };

    };

services/sensorservice/RingBuffer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ public: 
    /**

    /**

     * Construct a RingBuffer that can grow up to the given length.

     * Construct a RingBuffer that can grow up to the given length.

     */

     */

    RingBuffer(size_t length);

    explicit RingBuffer(size_t length);





    /**

    /**

     * Forward iterator to this class.  Implements an std:forward_iterator.

     * Forward iterator to this class.  Implements an std:forward_iterator.

services/sensorservice/RotationVectorSensor.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ namespace android { 




class RotationVectorSensor : public VirtualSensor {

class RotationVectorSensor : public VirtualSensor {

public:

public:

    RotationVectorSensor(int mode = FUSION_9AXIS);

    explicit RotationVectorSensor(int mode = FUSION_9AXIS);

    virtual bool process(sensors_event_t* outEvent, const sensors_event_t& event) override;

    virtual bool process(sensors_event_t* outEvent, const sensors_event_t& event) override;

    virtual status_t activate(void* ident, bool enabled) override;

    virtual status_t activate(void* ident, bool enabled) override;

    virtual status_t setDelay(void* ident, int handle, int64_t ns) override;

    virtual status_t setDelay(void* ident, int handle, int64_t ns) override;

services/sensorservice/SensorEventAckReceiver.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ class SensorService::SensorEventAckReceiver : public Thread { 
    sp<SensorService> const mService;

    sp<SensorService> const mService;

public:

public:

    virtual bool threadLoop();

    virtual bool threadLoop();

    SensorEventAckReceiver(const sp<SensorService>& service)

    explicit SensorEventAckReceiver(const sp<SensorService>& service)

            : mService(service) {

            : mService(service) {

    }

    }

};

};

services/sensorservice/SensorInterface.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ public: 




class BaseSensor : public SensorInterface {

class BaseSensor : public SensorInterface {

public:

public:

    BaseSensor(const sensor_t& sensor);

    explicit BaseSensor(const sensor_t& sensor);

    BaseSensor(const sensor_t& sensor, const uint8_t (&uuid)[16]);

    BaseSensor(const sensor_t& sensor, const uint8_t (&uuid)[16]);





    // Not all sensors need to support batching.

    // Not all sensors need to support batching.
@@ -74,7 +74,7 @@ protected: 




class HardwareSensor : public BaseSensor {

class HardwareSensor : public BaseSensor {

public:

public:

    HardwareSensor(const sensor_t& sensor);

    explicit HardwareSensor(const sensor_t& sensor);

    HardwareSensor(const sensor_t& sensor, const uint8_t (&uuid)[16]);

    HardwareSensor(const sensor_t& sensor, const uint8_t (&uuid)[16]);





    virtual ~HardwareSensor();

    virtual ~HardwareSensor();