From b639d14f1a97b77c4e69de480a6d222265094bba Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 14 Feb 2018 17:29:54 -0800 Subject: [PATCH] More formatting fixes for statsd Test: N/A Change-Id: I378cde8700655bfba26b112ae6df1b4347683bdb --- cmds/statsd/src/StatsService.cpp | 4 ++-- cmds/statsd/src/StatsService.h | 4 ++-- cmds/statsd/src/atoms.proto | 2 +- 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 0a4e412bff20c..791fb14a7717d 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& 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 fd658690435e9..9690de702c248 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& args); diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 1224504c67034..85e209be6413b 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 66e1aeb8f43ed..13e1f8c5b9f16 100644 --- a/cmds/statsd/src/metrics/MetricsManager.cpp +++ b/cmds/statsd/src/metrics/MetricsManager.cpp @@ -188,8 +188,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,