commit f58455ac680cc8ffa8e6ab48275f7c4812446efd
author Vova Sharaienko <sharaienko@google.com> Sat Sep 24 01:47:23 2022 +0000
committer Vova Sharaienko <sharaienko@google.com> Wed Oct 05 00:44:09 2022 +0000
tree e734f677c6e0634ab15d9d50d99569cd650fa576
parent bf9a1ecd9227062d9434ff4ee9165ae8b6baeb4f

media.metrics removed libstatslog dependency

Bug: 248582338
Test: build & statsd_testdrive
Change-Id: I37c7ee457e249b148c91b39adda50e5c337e7539

services/mediametrics/MediaMetricsService.cpp

diff --git a/services/mediametrics/MediaMetricsService.cpp b/services/mediametrics/MediaMetricsService.cpp
index ceb3e6a..b4de4f4 100644
--- a/services/mediametrics/MediaMetricsService.cpp
+++ b/services/mediametrics/MediaMetricsService.cpp
@@ -33,7 +33,7 @@
 #include <mediautils/MemoryLeakTrackUtil.h>
 #include <memunreachable/memunreachable.h>
 #include <private/android_filesystem_config.h> // UID
-#include <statslog.h>
+#include <stats_media_metrics.h>
 
 #include <set>
 
@@ -546,7 +546,7 @@
     if (mStatsdRegistered.test_and_set()) {
         return;
     }
-    auto tag = android::util::MEDIA_DRM_ACTIVITY_INFO;
+    auto tag = stats::media_metrics::MEDIA_DRM_ACTIVITY_INFO;
     auto cb = MediaMetricsService::pullAtomCallback;
     AStatsManager_setPullAtomCallback(tag, /* metadata */ nullptr, cb, this);
 }
@@ -564,7 +564,7 @@
 std::string MediaMetricsService::atomTagToKey(int32_t atomTag)
 {
     switch (atomTag) {
-    case android::util::MEDIA_DRM_ACTIVITY_INFO:
+    case stats::media_metrics::MEDIA_DRM_ACTIVITY_INFO:
         return "mediadrm";
     }
     return {};