ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libmetricslogger: Fix one incorrect (deprecated) logtag and one duplicate logtag."

Browse source 
am: 8f3989b820

Change-Id: I53da00a3015fc28bfc259960ae2b28ae00c22f3e
This commit is contained in:
James Hawkins 2017-09-19 22:50:17 +00:00 • committed by android-build-merger
commit ae4ae45ca7
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libmetricslogger/Android.bp
View file

@ -19,12 +19,10 @@ cc_defaults {
"-Wextra",
"-Werror",
// The following defines map logtag IDs as represented by:
// The following define maps the sysui_multi_action logtag ID as represented by:
// frameworks/base/core/java/com/android/internal/logging/EventLogTags.logtags
//
// E.g., 524290 corresponds to sysui_count.
"-DCOUNT_LOG_TAG=524290",
"-DHISTOGRAM_LOG_TAG=524292",
// TODO(jhawkins): Query this value at runtime.
"-DMULTI_ACTION_LOG_TAG=524292",
],
}

4
libmetricslogger/metrics_logger.cpp
View file

@ -25,14 +25,14 @@ namespace metricslogger {
// Mirror com.android.internal.logging.MetricsLogger#histogram().
void LogHistogram(const std::string& event, int32_t data) {
android_log_event_list log(HISTOGRAM_LOG_TAG);
android_log_event_list log(MULTI_ACTION_LOG_TAG);
log << LOGBUILDER_CATEGORY << LOGBUILDER_HISTOGRAM << LOGBUILDER_NAME << event
<< LOGBUILDER_BUCKET << data << LOGBUILDER_VALUE << 1 << LOG_ID_EVENTS;
}
// Mirror com.android.internal.logging.MetricsLogger#count().
void LogCounter(const std::string& name, int32_t val) {
android_log_event_list log(COUNT_LOG_TAG);
android_log_event_list log(MULTI_ACTION_LOG_TAG);
log << LOGBUILDER_CATEGORY << LOGBUILDER_COUNTER << LOGBUILDER_NAME << name << LOGBUILDER_VALUE
<< val << LOG_ID_EVENTS;
}