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

Commit f678a87c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-4601e3b1584e408da71c5f4ed61d7df2" 

* changes:
  Merge changes from topic "revert-protobuf3.5.2" am: a4680e1e am: 3e312d20 am: e217b622
  Revert "Convert statsd_test and statsd_benchmark to proto lite" am: 47046b80 am: 65200cf7 am: bd7c4efb
parents e1b3686f 872fd513

cmds/statsd/Android.bp

+4 −12
Original line number Diff line number Diff line
@@ -205,10 +205,6 @@ cc_test { 
    ],



    srcs: [

        // atom_field_options.proto needs field_options.proto, but that is

        // not included in libprotobuf-cpp-lite, so compile it here.

        ":libprotobuf-internal-protos",



        "src/atom_field_options.proto",

        "src/atoms.proto",

        "src/stats_log.proto",
@@ -263,11 +259,11 @@ cc_test { 
    ],



    proto: {

        type: "lite",

        type: "full",

        include_dirs: ["external/protobuf/src"],

    },



    shared_libs: ["libprotobuf-cpp-lite"],

    shared_libs: ["libprotobuf-cpp-full"],



}
@@ -280,10 +276,6 @@ cc_benchmark { 
    defaults: ["statsd_defaults"],



    srcs: [

        // atom_field_options.proto needs field_options.proto, but that is

        // not included in libprotobuf-cpp-lite, so compile it here.

        ":libprotobuf-internal-protos",



        "src/atom_field_options.proto",

        "src/atoms.proto",

        "src/stats_log.proto",
@@ -298,7 +290,7 @@ cc_benchmark { 
    ],



    proto: {

        type: "lite",

        type: "full",

        include_dirs: ["external/protobuf/src"],

    },
@@ -320,7 +312,7 @@ cc_benchmark { 
    shared_libs: [

        "libgtest_prod",

        "libstatslog",

        "libprotobuf-cpp-lite",

        "libprotobuf-cpp-full",

    ],

}

cmds/statsd/src/anomaly/AnomalyTracker.cpp

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "subscriber/IncidentdReporter.h"

#include "subscriber/SubscriberReporter.h"



#include <inttypes.h>

#include <statslog.h>

#include <time.h>
@@ -224,7 +223,7 @@ void AnomalyTracker::declareAnomaly(const int64_t& timestampNs, const MetricDime 
    }



    if (!mSubscriptions.empty()) {

        ALOGI("An anomaly (%" PRId64 ") %s has occurred! Informing subscribers.",

        ALOGI("An anomaly (%lld) %s has occurred! Informing subscribers.",

                mAlert.id(), key.toString().c_str());

        informSubscribers(key);

    } else {

cmds/statsd/src/metrics/metrics_manager_util.cpp

+1 −3
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 
#include "stats_util.h"

#include "statslog.h"



#include <inttypes.h>



using std::set;

using std::string;

using std::unordered_map;
@@ -575,7 +573,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t 
    for (int i = 0; i < config.no_report_metric_size(); ++i) {

        const auto no_report_metric = config.no_report_metric(i);

        if (metricMap.find(no_report_metric) == metricMap.end()) {

            ALOGW("no_report_metric %" PRId64 " not exist", no_report_metric);

            ALOGW("no_report_metric %lld not exist", no_report_metric);

            return false;

        }

        noReportMetricIds.insert(no_report_metric);

libs/hwui/service/GraphicsStatsService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -232,9 +232,9 @@ void dumpAsTextToFd(protos::GraphicsStatsProto* proto, int fd) { 
        return;

    }

    dprintf(fd, "\nPackage: %s", proto->package_name().c_str());

    dprintf(fd, "\nVersion: %" PRId64, proto->version_code());

    dprintf(fd, "\nStats since: %" PRId64 "ns", proto->stats_start());

    dprintf(fd, "\nStats end: %" PRId64 "ns", proto->stats_end());

    dprintf(fd, "\nVersion: %lld", proto->version_code());

    dprintf(fd, "\nStats since: %lldns", proto->stats_start());

    dprintf(fd, "\nStats end: %lldns", proto->stats_end());

    auto summary = proto->summary();

    dprintf(fd, "\nTotal frames rendered: %d", summary.total_frames());

    dprintf(fd, "\nJanky frames: %d (%.2f%%)", summary.janky_frames(),

libs/protoutil/include/android/util/ProtoOutputStream.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ public: 
    bool write(uint64_t fieldId, double val);

    bool write(uint64_t fieldId, float val);

    bool write(uint64_t fieldId, int val);

    bool write(uint64_t fieldId, long val);

    bool write(uint64_t fieldId, long long val);

    bool write(uint64_t fieldId, bool val);

    bool write(uint64_t fieldId, std::string val);