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

Commit 44f74d11 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes from topic "protobuf3.5.2" am: 1d899f6b am: 11a4d775 

am: c836696a

Change-Id: I158185738327cee8f501dcba7e85de66240eaf42
parents 5d258093 c836696a

cmds/statsd/src/anomaly/AnomalyTracker.cpp

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

#include "subscriber/SubscriberReporter.h"



#include <inttypes.h>

#include <statslog.h>

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



    if (!mSubscriptions.empty()) {

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

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

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

        informSubscribers(key);

    } else {

cmds/statsd/src/metrics/metrics_manager_util.cpp

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

#include "statslog.h"



#include <inttypes.h>



using std::set;

using std::string;

using std::unordered_map;
@@ -573,7 +575,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 %lld not exist", no_report_metric);

            ALOGW("no_report_metric %" PRId64 " 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: %lld", proto->version_code());

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

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

    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());

    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

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 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);

libs/protoutil/src/ProtoOutputStream.cpp

+28 −0
Original line number Diff line number Diff line
@@ -115,6 +115,34 @@ ProtoOutputStream::write(uint64_t fieldId, int val) 
    return internalWrite(fieldId, val, "int");

}



bool

ProtoOutputStream::write(uint64_t fieldId, long val)

{

    if (mCompact) return false;

    const uint32_t id = (uint32_t)fieldId;

    switch (fieldId & FIELD_TYPE_MASK) {

        case FIELD_TYPE_DOUBLE:   writeDoubleImpl(id, (double)val);           break;

        case FIELD_TYPE_FLOAT:    writeFloatImpl(id, (float)val);             break;

        case FIELD_TYPE_INT64:    writeInt64Impl(id, (long long)val);         break;

        case FIELD_TYPE_UINT64:   writeUint64Impl(id, (uint64_t)val);         break;

        case FIELD_TYPE_INT32:    writeInt32Impl(id, (int)val);               break;

        case FIELD_TYPE_FIXED64:  writeFixed64Impl(id, (uint64_t)val);        break;

        case FIELD_TYPE_FIXED32:  writeFixed32Impl(id, (uint32_t)val);        break;

        case FIELD_TYPE_UINT32:   writeUint32Impl(id, (uint32_t)val);         break;

        case FIELD_TYPE_SFIXED32: writeSFixed32Impl(id, (int)val);            break;

        case FIELD_TYPE_SFIXED64: writeSFixed64Impl(id, (long long)val);      break;

        case FIELD_TYPE_SINT32:   writeZigzagInt32Impl(id, (int)val);         break;

        case FIELD_TYPE_SINT64:   writeZigzagInt64Impl(id, (long long)val);   break;

        case FIELD_TYPE_ENUM:     writeEnumImpl(id, (int)val);                break;

        case FIELD_TYPE_BOOL:     writeBoolImpl(id, val != 0);                break;

        default:

            ALOGW("Field type %d is not supported when writing long val.",

                    (int)((fieldId & FIELD_TYPE_MASK) >> FIELD_TYPE_SHIFT));

            return false;

    }

    return true;

}



bool

ProtoOutputStream::write(uint64_t fieldId, long long val)

{