diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-15 19:26:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-15 19:26:32 +0000 |
| commit | 7d5beeb25530ec016557f37bb900b201ba4d498c (patch) | |
| tree | 5de75b38e3a728437ed0101e648dc3ad8ffd5e7c | |
| parent | bc5fc746a7cc85f1d39c16659a6603b23e33369a (diff) | |
| parent | b639d14f1a97b77c4e69de480a6d222265094bba (diff) | |
Merge "More formatting fixes for statsd"
| -rw-r--r-- | cmds/statsd/src/StatsService.cpp | 4 | ||||
| -rw-r--r-- | cmds/statsd/src/StatsService.h | 4 | ||||
| -rw-r--r-- | cmds/statsd/src/atoms.proto | 2 | ||||
| -rw-r--r-- | cmds/statsd/src/metrics/MetricsManager.cpp | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index 0a4e412bff20..791fb14a7717 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -571,8 +571,8 @@ status_t StatsService::cmd_log_app_breadcrumb(FILE* out, const Vector<String8>& good = true; } else { fprintf(out, - "Selecting a UID for writing Appbreadcrumb can only be dumped for other UIDs on eng" - " or userdebug builds.\n"); + "Selecting a UID for writing AppBreadcrumb can only be done for other UIDs " + "on eng or userdebug builds.\n"); } } if (good) { diff --git a/cmds/statsd/src/StatsService.h b/cmds/statsd/src/StatsService.h index fd658690435e..9690de702c24 100644 --- a/cmds/statsd/src/StatsService.h +++ b/cmds/statsd/src/StatsService.h @@ -193,8 +193,8 @@ private: status_t cmd_write_data_to_disk(FILE* out); /** - * Write an AppBreadcrumbReported event to the StatsLog buffer, as though StatsLog.write - * (APP_BREADCRUMB_REPORTED). + * Write an AppBreadcrumbReported event to the StatsLog buffer, as if calling + * StatsLog.write(APP_BREADCRUMB_REPORTED). */ status_t cmd_log_app_breadcrumb(FILE* out, const Vector<String8>& args); diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 1224504c6703..85e209be6413 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -1471,7 +1471,7 @@ message SystemUptime { */ message CpuActiveTime { optional uint64 uid = 1; - optional uint32 cluster_number =2; + optional uint32 cluster_number = 2; optional uint64 idx = 3; optional uint64 time_millis = 4; } diff --git a/cmds/statsd/src/metrics/MetricsManager.cpp b/cmds/statsd/src/metrics/MetricsManager.cpp index ddc05c64415a..e75b710cc9db 100644 --- a/cmds/statsd/src/metrics/MetricsManager.cpp +++ b/cmds/statsd/src/metrics/MetricsManager.cpp @@ -190,8 +190,9 @@ void MetricsManager::onLogEvent(const LogEvent& event) { return; } - if (event.GetTagId() == android::util::APP_BREADCRUMB_REPORTED) { // Check that app hook fields are valid. - // TODO: Find a way to make these checks easier to maintain if the app hooks get changed. + if (event.GetTagId() == android::util::APP_BREADCRUMB_REPORTED) { + // Check that app breadcrumb reported fields are valid. + // TODO: Find a way to make these checks easier to maintain. status_t err = NO_ERROR; // Uid is 3rd from last field and must match the caller's uid, |