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

Commit 7d5beeb2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "More formatting fixes for statsd"

parents bc5fc746 b639d14f

cmds/statsd/src/StatsService.cpp

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

cmds/statsd/src/StatsService.h

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

cmds/statsd/src/metrics/MetricsManager.cpp

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

cmds/statsd/src/atoms.proto

+1 −1

File changed.

Contains only whitespace changes.