commit a9dfe58e2fa07968e4ffcbe1946df48f3973e482
author James Hawkins <jhawkins@google.com> Tue Sep 19 12:03:47 2017 -0700
committer James Hawkins <jhawkins@google.com> Wed Sep 20 08:18:05 2017 -0700
tree 117168163e79e29f7a5bc4a7e5d2d7cb77f37c87
parent f2efa9b9408e9698cb572f9f004f7fedd9bb538f

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

Bug: 65841976
Bug: 65961260
Test: none
Change-Id: I6491c3c05e3a56b45d4a77cfa83f8e14eb226e64
(cherry picked from commit 2dcca295a610be5ba0ddaca90e6887649de2413d)

libmetricslogger/Android.bp

diff --git a/libmetricslogger/Android.bp b/libmetricslogger/Android.bp
index 15d1ff2..e292403 100644
--- a/libmetricslogger/Android.bp
+++ b/libmetricslogger/Android.bp
@@ -20,12 +20,10 @@
         "-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",
     ],
 }

libmetricslogger/metrics_logger.cpp

diff --git a/libmetricslogger/metrics_logger.cpp b/libmetricslogger/metrics_logger.cpp
index a0dcf09..0ca024d 100644
--- a/libmetricslogger/metrics_logger.cpp
+++ b/libmetricslogger/metrics_logger.cpp
@@ -25,14 +25,14 @@
 
 // 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;
 }