Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix/suppress statsd google-explicit-constructor warnings"

Browse Source 
am: 699692402a

Change-Id: I5a8a2934a83691c4689dfd3a7de9c1ea6da66032
This commit is contained in:
Chih-hung Hsieh
2018-12-21 08:55:05 -08:00
committed by android-build-merger
parent 78085ba0a3 699692402a
commit 32dc82a63a
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/statsd/src/anomaly/AlarmMonitor.h
View File

@@ -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;

2
cmds/statsd/src/condition/ConditionWizard.h
View File

@@ -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(){};

2
cmds/statsd/src/config/ConfigKey.h
View File

@@ -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();

2
cmds/statsd/src/external/ResourceHealthManagerPuller.h vendored
View File

@@ -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;
}; };

2
cmds/statsd/src/external/StatsCompanionServicePuller.h vendored
View File

@@ -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;

2
cmds/statsd/src/external/StatsPuller.h vendored
View File

@@ -33,7 +33,7 @@ namespace statsd {
class StatsPuller : public virtual RefBase { class StatsPuller : public virtual RefBase {
public: public:
StatsPuller(const int tagId); explicit StatsPuller(const int tagId);
virtual ~StatsPuller() {} virtual ~StatsPuller() {}

2
cmds/statsd/src/logd/LogEvent.h
View File

@@ -158,7 +158,7 @@ private:
* Don't copy, it's slower. If we really need this we can add it but let's try to * Don't copy, it's slower. If we really need this we can add it but let's try to
* avoid it. * avoid it.
*/ */
explicit LogEvent(const LogEvent&); LogEvent(const LogEvent&);
/** /**
* Parses a log_msg into a LogEvent object. * Parses a log_msg into a LogEvent object.

4
cmds/statsd/src/socket/StatsSocketListener.h
View File

@@ -35,7 +35,7 @@ namespace statsd {
class StatsSocketListener : public SocketListener, public virtual android::RefBase { class StatsSocketListener : public SocketListener, public virtual android::RefBase {
public: public:
StatsSocketListener(const sp<LogListener>& listener); explicit StatsSocketListener(const sp<LogListener>& listener);
virtual ~StatsSocketListener(); virtual ~StatsSocketListener();
@@ -51,4 +51,4 @@ private:
}; };
} // namespace statsd } // namespace statsd
} // namespace os } // namespace os
} // namespace android } // namespace android