commit f99bcdda484ed8c533bf2b2cce7187e9acf500c6
author Santiago Seifert <aquilescanta@google.com> Fri Nov 06 10:52:36 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 06 10:52:36 2020 +0000
tree 7da52ebe04e895e7bb4beb90d5c46bf55d8d0538
parent 87b380d9c185ac34148618c3d0d579afbd16fac2
parent 1c81d4214959ad2ac7924b9e9f2426344a101699

Merge "Allow MediaMetrics entries from MediaParser" into rvc-qpr-dev

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) {