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

Commit b51d2df5 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress statsd google-explicit-constructor warnings" am: 69969240 

am: 32dc82a6

Change-Id: I0dbf5428746a8e2bcf3413f65f8eefc2069741e6
parents ee844ad9 32dc82a6

cmds/statsd/src/anomaly/AlarmMonitor.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ namespace statsd { 
 * Timestamps are in seconds since epoch in a uint32, so will fail in year 2106.

 * Timestamps are in seconds since epoch in a uint32, so will fail in year 2106.

 */

 */

struct InternalAlarm : public RefBase {

struct InternalAlarm : public RefBase {

    InternalAlarm(uint32_t timestampSec) : timestampSec(timestampSec) {

    explicit InternalAlarm(uint32_t timestampSec) : timestampSec(timestampSec) {

    }

    }





    const uint32_t timestampSec;

    const uint32_t timestampSec;

cmds/statsd/src/condition/ConditionWizard.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ namespace statsd { 
class ConditionWizard : public virtual android::RefBase {

class ConditionWizard : public virtual android::RefBase {

public:

public:

    ConditionWizard(){};  // for testing

    ConditionWizard(){};  // for testing

    ConditionWizard(std::vector<sp<ConditionTracker>>& conditionTrackers)

    explicit ConditionWizard(std::vector<sp<ConditionTracker>>& conditionTrackers)

        : mAllConditions(conditionTrackers){};

        : mAllConditions(conditionTrackers){};





    virtual ~ConditionWizard(){};

    virtual ~ConditionWizard(){};

cmds/statsd/src/config/ConfigKey.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ using std::string; 
class ConfigKey {

class ConfigKey {

public:

public:

    ConfigKey();

    ConfigKey();

    explicit ConfigKey(const ConfigKey& that);

    ConfigKey(const ConfigKey& that);

    ConfigKey(int uid, const int64_t& id);

    ConfigKey(int uid, const int64_t& id);

    ~ConfigKey();

    ~ConfigKey();

cmds/statsd/src/external/ResourceHealthManagerPuller.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ namespace statsd { 
 */

 */

class ResourceHealthManagerPuller : public StatsPuller {

class ResourceHealthManagerPuller : public StatsPuller {

public:

public:

    ResourceHealthManagerPuller(int tagId);

    explicit ResourceHealthManagerPuller(int tagId);

    bool PullInternal(vector<std::shared_ptr<LogEvent>>* data) override;

    bool PullInternal(vector<std::shared_ptr<LogEvent>>* data) override;

};

};

cmds/statsd/src/external/StatsCompanionServicePuller.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ namespace statsd { 




class StatsCompanionServicePuller : public StatsPuller {

class StatsCompanionServicePuller : public StatsPuller {

public:

public:

    StatsCompanionServicePuller(int tagId);

    explicit StatsCompanionServicePuller(int tagId);

    bool PullInternal(vector<std::shared_ptr<LogEvent> >* data) override;

    bool PullInternal(vector<std::shared_ptr<LogEvent> >* data) override;





    void SetStatsCompanionService(sp<IStatsCompanionService> statsCompanionService) override;

    void SetStatsCompanionService(sp<IStatsCompanionService> statsCompanionService) override;