Move proto messages from enums/ to message/
Bug: 184754707
Test: make
Change-Id: I21acc5ff1296d5ed6f5fcbea67a82d11bb037337
Merged-In: I21acc5ff1296d5ed6f5fcbea67a82d11bb037337
diff --git a/services/mediametrics/statsd_audiopolicy.cpp b/services/mediametrics/statsd_audiopolicy.cpp
index f44b7c4..3d9376e 100644
--- a/services/mediametrics/statsd_audiopolicy.cpp
+++ b/services/mediametrics/statsd_audiopolicy.cpp
@@ -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 @@
// 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
//
diff --git a/services/mediametrics/statsd_audiorecord.cpp b/services/mediametrics/statsd_audiorecord.cpp
index 70a67ae..41efcaa 100644
--- a/services/mediametrics/statsd_audiorecord.cpp
+++ b/services/mediametrics/statsd_audiorecord.cpp
@@ -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 @@
// 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
//
diff --git a/services/mediametrics/statsd_audiothread.cpp b/services/mediametrics/statsd_audiothread.cpp
index 34cc923..e9b6dd6 100644
--- a/services/mediametrics/statsd_audiothread.cpp
+++ b/services/mediametrics/statsd_audiothread.cpp
@@ -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 @@
// 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."
diff --git a/services/mediametrics/statsd_audiotrack.cpp b/services/mediametrics/statsd_audiotrack.cpp
index fe269a1..59627ae 100644
--- a/services/mediametrics/statsd_audiotrack.cpp
+++ b/services/mediametrics/statsd_audiotrack.cpp
@@ -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 @@
// 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
//
diff --git a/services/mediametrics/statsd_extractor.cpp b/services/mediametrics/statsd_extractor.cpp
index 2378f33..4ac5621 100644
--- a/services/mediametrics/statsd_extractor.cpp
+++ b/services/mediametrics/statsd_extractor.cpp
@@ -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 @@
// 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 @@
}
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);
}
diff --git a/services/mediametrics/statsd_nuplayer.cpp b/services/mediametrics/statsd_nuplayer.cpp
index 33da81e..bdee1f2 100644
--- a/services/mediametrics/statsd_nuplayer.cpp
+++ b/services/mediametrics/statsd_nuplayer.cpp
@@ -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 {
@@ -54,7 +54,7 @@
// the rest into our own proto
//
- ::android::stats::mediametrics::NuPlayerData metrics_proto;
+ ::android::stats::mediametrics_message::NuPlayerData metrics_proto;
// flesh out the protobuf we'll hand off with our data
//