Merge "Displays mediadrm and Widevine metrics in dumpsys"

4 years ago · a199662c6a
parent 8a93a1f6dd 8d18835667
commit a199662c6a
1 changed files with 5 additions and 0 deletions
--- a/services/mediametrics/MediaMetricsService.cpp
+++ b/services/mediametrics/MediaMetricsService.cpp
@ -436,6 +436,10 @@ bool MediaMetricsService::isContentValid(const mediametrics::Item *item, bool is
    // untrusted uids can only send us a limited set of keys
    const std::string &key = item->getKey();
    if (startsWith(key, "audio.")) return true;
+    if (startsWith(key, "drm.vendor.")) return true;
+    // the list of allowedKey uses statsd_handlers
+    // in iface_statsd.cpp as reference
+    // drmmanager is from a trusted uid, therefore not needed here
    for (const char *allowedKey : {
                                     // legacy audio
                                     "audiopolicy",
@ -445,6 +449,7 @@ bool MediaMetricsService::isContentValid(const mediametrics::Item *item, bool is
                                     // other media
                                     "codec",
                                     "extractor",
+                                     "mediadrm",
                                     "nuplayer",
                                 }) {
        if (key == allowedKey) {