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

Commit 97299bcd authored by Shubang Lu's avatar Shubang Lu Committed by Automerger Merge Worker
Browse files

Merge "Move proto messages from enums/ to message/" into sc-dev am: 914b4a37 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14453287

Change-Id: I7fc1dc47dad9314d610d94e688f2bcde0827b77d
parents d91c4ad0 914b4a37

services/mediametrics/statsd_audiopolicy.cpp

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <statslog.h>



#include "MediaMetricsService.h"

#include "frameworks/proto_logging/stats/enums/stats/mediametrics/mediametrics.pb.h"

#include "frameworks/proto_logging/stats/message/mediametrics_message.pb.h"

#include "iface_statsd.h"



namespace android {
@@ -50,7 +50,7 @@ bool statsd_audiopolicy(const std::shared_ptr<const mediametrics::Item>& item, 


    // the rest into our own proto

    //

    ::android::stats::mediametrics::AudioPolicyData metrics_proto;

    ::android::stats::mediametrics_message::AudioPolicyData metrics_proto;



    // flesh out the protobuf we'll hand off with our data

    //

services/mediametrics/statsd_audiorecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#include "MediaMetricsService.h"

#include "StringUtils.h"

#include "frameworks/proto_logging/stats/enums/stats/mediametrics/mediametrics.pb.h"

#include "frameworks/proto_logging/stats/message/mediametrics_message.pb.h"

#include "iface_statsd.h"



namespace android {
@@ -50,7 +50,7 @@ bool statsd_audiorecord(const std::shared_ptr<const mediametrics::Item>& item, 


    // the rest into our own proto

    //

    ::android::stats::mediametrics::AudioRecordData metrics_proto;

    ::android::stats::mediametrics_message::AudioRecordData metrics_proto;



    // flesh out the protobuf we'll hand off with our data

    //

services/mediametrics/statsd_audiothread.cpp

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <statslog.h>



#include "MediaMetricsService.h"

#include "frameworks/proto_logging/stats/enums/stats/mediametrics/mediametrics.pb.h"

#include "frameworks/proto_logging/stats/message/mediametrics_message.pb.h"

#include "iface_statsd.h"



namespace android {
@@ -50,7 +50,7 @@ bool statsd_audiothread(const std::shared_ptr<const mediametrics::Item>& item, 


    // the rest into our own proto

    //

    ::android::stats::mediametrics::AudioThreadData metrics_proto;

    ::android::stats::mediametrics_message::AudioThreadData metrics_proto;



#define	MM_PREFIX "android.media.audiothread."

services/mediametrics/statsd_audiotrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#include "MediaMetricsService.h"

#include "StringUtils.h"

#include "frameworks/proto_logging/stats/enums/stats/mediametrics/mediametrics.pb.h"

#include "frameworks/proto_logging/stats/message/mediametrics_message.pb.h"

#include "iface_statsd.h"



namespace android {
@@ -51,7 +51,7 @@ bool statsd_audiotrack(const std::shared_ptr<const mediametrics::Item>& item, 


    // the rest into our own proto

    //

    ::android::stats::mediametrics::AudioTrackData metrics_proto;

    ::android::stats::mediametrics_message::AudioTrackData metrics_proto;



    // flesh out the protobuf we'll hand off with our data

    //

services/mediametrics/statsd_extractor.cpp

+8 −8
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <statslog.h>



#include "MediaMetricsService.h"

#include "frameworks/proto_logging/stats/enums/stats/mediametrics/mediametrics.pb.h"

#include "frameworks/proto_logging/stats/message/mediametrics_message.pb.h"

#include "iface_statsd.h"



namespace android {
@@ -50,7 +50,7 @@ bool statsd_extractor(const std::shared_ptr<const mediametrics::Item>& item, 


    // the rest into our own proto

    //

    ::android::stats::mediametrics::ExtractorData metrics_proto;

    ::android::stats::mediametrics_message::ExtractorData metrics_proto;



    std::string format;

    if (item->getString("android.media.mediaextractor.fmt", &format)) {
@@ -68,17 +68,17 @@ bool statsd_extractor(const std::shared_ptr<const mediametrics::Item>& item, 
    }



    std::string entry_point_string;

    stats::mediametrics::ExtractorData::EntryPoint entry_point =

            stats::mediametrics::ExtractorData_EntryPoint_OTHER;

    stats::mediametrics_message::ExtractorData::EntryPoint entry_point =

            stats::mediametrics_message::ExtractorData_EntryPoint_OTHER;

    if (item->getString("android.media.mediaextractor.entry", &entry_point_string)) {

      if (entry_point_string == "sdk") {

        entry_point = stats::mediametrics::ExtractorData_EntryPoint_SDK;

        entry_point = stats::mediametrics_message::ExtractorData_EntryPoint_SDK;

      } else if (entry_point_string == "ndk-with-jvm") {

        entry_point = stats::mediametrics::ExtractorData_EntryPoint_NDK_WITH_JVM;

        entry_point = stats::mediametrics_message::ExtractorData_EntryPoint_NDK_WITH_JVM;

      } else if (entry_point_string == "ndk-no-jvm") {

        entry_point = stats::mediametrics::ExtractorData_EntryPoint_NDK_NO_JVM;

        entry_point = stats::mediametrics_message::ExtractorData_EntryPoint_NDK_NO_JVM;

      } else {

        entry_point = stats::mediametrics::ExtractorData_EntryPoint_OTHER;

        entry_point = stats::mediametrics_message::ExtractorData_EntryPoint_OTHER;

      }

      metrics_proto.set_entry_point(entry_point);

    }