Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae4ae45c authored by James Hawkins's avatar James Hawkins Committed by android-build-merger
Browse files

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

am: 8f3989b8

Change-Id: I53da00a3015fc28bfc259960ae2b28ae00c22f3e
parents 61b81a03 8f3989b8

libmetricslogger/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -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",

    ],

}

libmetricslogger/metrics_logger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

}