commit f7022f2a3f4a36a3cb4763a139ee909b60b7b258
author Santiago Seifert <aquilescanta@google.com> Fri Aug 07 13:48:45 2020 +0100
committer Santiago Seifert <aquilescanta@google.com> Fri Oct 30 16:43:02 2020 +0000
tree 1f8a4f7ef1052d49a9a98b6cb34b3d81828c6269
parent 9dec61cd738ce145e3ba427c2daaada081389a77

Allow MediaMetrics entries from MediaParser

- Make MediaMetrcis stable C API visible to the media mainline module.
- Allow-list MediaMetrics entries from MediaParser.

Bug: 158742256
Test: Manual.
Change-Id: Icca73a9396195d8cf299eb03bc778a032aacc364
Merged-In: Icca73a9396195d8cf299eb03bc778a032aacc364
(cherry picked from commit 49fb4521427825e4d443260d6395446536f778cc)

media/libmediametrics/Android.bp

diff --git a/media/libmediametrics/Android.bp b/media/libmediametrics/Android.bp
index 03068c7..a63b8b4 100644
--- a/media/libmediametrics/Android.bp
+++ b/media/libmediametrics/Android.bp
@@ -53,6 +53,7 @@
     visibility: [
         "//cts/tests/tests/nativemedia/mediametrics",
         "//frameworks/av:__subpackages__",
+        "//frameworks/base/apex/media/framework",
         "//frameworks/base/core/jni",
         "//frameworks/base/media/jni",
     ],

services/mediametrics/MediaMetricsService.cpp

diff --git a/services/mediametrics/MediaMetricsService.cpp b/services/mediametrics/MediaMetricsService.cpp
index 48e766e..bf6e428 100644
--- a/services/mediametrics/MediaMetricsService.cpp
+++ b/services/mediametrics/MediaMetricsService.cpp
@@ -468,6 +468,7 @@
                                      "codec",
                                      "extractor",
                                      "mediadrm",
+                                     "mediaparser",
                                      "nuplayer",
                                  }) {
         if (key == allowedKey) {