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

Merge "More formatting fixes for statsd"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-15 19:26:32 +00:00
committed by Android (Google) Code Review
parent bc5fc746a7 b639d14f1a
commit 7d5beeb255
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/statsd/src/StatsService.cpp
View File

@@ -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) {

4
cmds/statsd/src/StatsService.h
View File

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

2
cmds/statsd/src/atoms.proto
View File

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

5
cmds/statsd/src/metrics/MetricsManager.cpp
View File

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