Merge "Displays mediadrm and Widevine metrics in dumpsys" (a199662c) · Commits · e / devices / smdk4412 / android_frameworks_av

services/mediametrics/MediaMetricsService.cpp

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -436,6 +436,10 @@ bool MediaMetricsService::isContentValid(const mediametrics::Item *item, bool is
	// untrusted uids can only send us a limited set of keys		// untrusted uids can only send us a limited set of keys
	const std::string &key = item->getKey();		const std::string &key = item->getKey();
	if (startsWith(key, "audio.")) return true;		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 : {		for (const char *allowedKey : {
	// legacy audio		// legacy audio
	"audiopolicy",		"audiopolicy",
	@@ -445,6 +449,7 @@ bool MediaMetricsService::isContentValid(const mediametrics::Item *item, bool is
	// other media		// other media
	"codec",		"codec",
	"extractor",		"extractor",
			"mediadrm",
	"nuplayer",		"nuplayer",
	}) {		}) {
	if (key == allowedKey) {		if (key == allowedKey) {