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

Commit 190125e6 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress sensor google-explicit-constructor warnings" am: fbcaaeb1 

am: c9265b50

Change-Id: I2b4d1f81cae79ca9e2b37f6cbbea175371e2d222
parents 5d8a07c1 c9265b50

libs/sensor/include/sensor/Sensor.h

+3 −3
Original line number Diff line number Diff line
@@ -57,15 +57,15 @@ public: 
            uint8_t b[16];

            int64_t i64[2];

        };

        uuid_t(const uint8_t (&uuid)[16]) { memcpy(b, uuid, sizeof(b));}

        explicit uuid_t(const uint8_t (&uuid)[16]) { memcpy(b, uuid, sizeof(b));}

        uuid_t() : b{0} {}

    };



    Sensor(const Sensor&) = default;

    Sensor& operator=(const Sensor&) = default;



    Sensor(const char * name = "");

    Sensor(struct sensor_t const* hwSensor, int halVersion = 0);

    explicit Sensor(const char * name = "");

    explicit Sensor(struct sensor_t const* hwSensor, int halVersion = 0);

    Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersion = 0);

    ~Sensor();

libs/sensor/include/sensor/SensorEventQueue.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public: 
    // Default sensor sample period

    static constexpr int32_t SENSOR_DELAY_NORMAL = 200000;



    SensorEventQueue(const sp<ISensorEventConnection>& connection);

    explicit SensorEventQueue(const sp<ISensorEventConnection>& connection);

    virtual ~SensorEventQueue();

    virtual void onFirstRef();

libs/sensor/include/sensor/SensorManager.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ private: 
    void sensorManagerDied();

    static status_t waitForSensorService(sp<ISensorServer> *server);



    SensorManager(const String16& opPackageName);

    explicit SensorManager(const String16& opPackageName);

    status_t assertStateLocked();



private:

services/sensorservice/SensorRecord.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class SensorService; 


class SensorService::SensorRecord {

public:

    SensorRecord(const sp<const SensorEventConnection>& connection);

    explicit SensorRecord(const sp<const SensorEventConnection>& connection);

    bool addConnection(const sp<const SensorEventConnection>& connection);

    bool removeConnection(const wp<const SensorEventConnection>& connection);

    size_t getNumConnections() const { return mConnections.size(); }

services/sensorservice/hidl/include/sensorservicehidl/SensorManager.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ using ::android::sp; 


struct SensorManager final : public ISensorManager {



    SensorManager(JavaVM* vm);

    explicit SensorManager(JavaVM* vm);

    ~SensorManager();



    // Methods from ::android::frameworks::sensorservice::V1_0::ISensorManager follow.