Merge "replace char * with std::string" into rvc-dev (56c303b7) · Commits · e / os / android_frameworks_av

services/mediametrics/statsd_drm.cpp

+25 −33

Original line number	Original line	Diff line number	Diff line
	@@ -50,30 +50,26 @@ bool statsd_mediadrm(const mediametrics::Item *item)
	int64_t pkgVersionCode = item->getPkgVersionCode();		int64_t pkgVersionCode = item->getPkgVersionCode();
	int64_t mediaApexVersion = 0;		int64_t mediaApexVersion = 0;

	char *vendor = nullptr;		std::string vendor;
	(void) item->getCString("vendor", &vendor);		(void) item->getString("vendor", &vendor);
	char *description = nullptr;		std::string description;
	(void) item->getCString("description", &description);		(void) item->getString("description", &description);
	char *serialized_metrics = nullptr;		std::string serialized_metrics;
	(void) item->getCString("serialized_metrics", &serialized_metrics);		(void) item->getString("serialized_metrics", &serialized_metrics);

	if (enabled_statsd) {		if (enabled_statsd) {
	android::util::BytesField bf_serialized(serialized_metrics ? serialized_metrics : nullptr,		android::util::BytesField bf_serialized(serialized_metrics.c_str(),
	serialized_metrics ? strlen(serialized_metrics)		serialized_metrics.size());
	: 0);
	android::util::stats_write(android::util::MEDIAMETRICS_MEDIADRM_REPORTED,		android::util::stats_write(android::util::MEDIAMETRICS_MEDIADRM_REPORTED,
	timestamp, pkgName.c_str(), pkgVersionCode,		timestamp, pkgName.c_str(), pkgVersionCode,
	mediaApexVersion,		mediaApexVersion,
	vendor, description,		vendor.c_str(),
			description.c_str(),
	bf_serialized);		bf_serialized);
	} else {		} else {
	ALOGV("NOT sending: mediadrm private data (len=%zu)",		ALOGV("NOT sending: mediadrm private data (len=%zu)", serialized_metrics.size());
	serialized_metrics ? strlen(serialized_metrics) : 0);
	}		}

	free(vendor);
	free(description);
	free(serialized_metrics);
	return true;		return true;
	}		}

	@@ -87,23 +83,20 @@ bool statsd_widevineCDM(const mediametrics::Item *item)
	int64_t pkgVersionCode = item->getPkgVersionCode();		int64_t pkgVersionCode = item->getPkgVersionCode();
	int64_t mediaApexVersion = 0;		int64_t mediaApexVersion = 0;

	char *serialized_metrics = nullptr;		std::string serialized_metrics;
	(void) item->getCString("serialized_metrics", &serialized_metrics);		(void) item->getString("serialized_metrics", &serialized_metrics);

	if (enabled_statsd) {		if (enabled_statsd) {
	android::util::BytesField bf_serialized(serialized_metrics ? serialized_metrics : nullptr,		android::util::BytesField bf_serialized(serialized_metrics.c_str(),
	serialized_metrics ? strlen(serialized_metrics)		serialized_metrics.size());
	: 0);
	android::util::stats_write(android::util::MEDIAMETRICS_DRM_WIDEVINE_REPORTED,		android::util::stats_write(android::util::MEDIAMETRICS_DRM_WIDEVINE_REPORTED,
	timestamp, pkgName.c_str(), pkgVersionCode,		timestamp, pkgName.c_str(), pkgVersionCode,
	mediaApexVersion,		mediaApexVersion,
	bf_serialized);		bf_serialized);
	} else {		} else {
	ALOGV("NOT sending: widevine private data (len=%zu)",		ALOGV("NOT sending: widevine private data (len=%zu)", serialized_metrics.size());
	serialized_metrics ? strlen(serialized_metrics) : 0);
	}		}

	free(serialized_metrics);
	return true;		return true;
	}		}

	@@ -123,14 +116,14 @@ bool statsd_drmmanager(const mediametrics::Item *item)
	int64_t pkgVersionCode = item->getPkgVersionCode();		int64_t pkgVersionCode = item->getPkgVersionCode();
	int64_t mediaApexVersion = 0;		int64_t mediaApexVersion = 0;

	char *plugin_id = nullptr;		std::string plugin_id;
	(void) item->getCString("plugin_id", &plugin_id);		(void) item->getString("plugin_id", &plugin_id);
	char *description = nullptr;		std::string description;
	(void) item->getCString("description", &description);		(void) item->getString("description", &description);
	int32_t method_id = -1;		int32_t method_id = -1;
	(void) item->getInt32("method_id", &method_id);		(void) item->getInt32("method_id", &method_id);
	char *mime_types = nullptr;		std::string mime_types;
	(void) item->getCString("mime_types", &mime_types);		(void) item->getString("mime_types", &mime_types);

	// Corresponds to the 13 APIs tracked in the MediametricsDrmManagerReported statsd proto		// Corresponds to the 13 APIs tracked in the MediametricsDrmManagerReported statsd proto
	// Please see also DrmManager::kMethodIdMap		// Please see also DrmManager::kMethodIdMap
	@@ -141,16 +134,15 @@ bool statsd_drmmanager(const mediametrics::Item *item)

	android::util::stats_write(android::util::MEDIAMETRICS_DRMMANAGER_REPORTED,		android::util::stats_write(android::util::MEDIAMETRICS_DRMMANAGER_REPORTED,
	timestamp, pkgName.c_str(), pkgVersionCode, mediaApexVersion,		timestamp, pkgName.c_str(), pkgVersionCode, mediaApexVersion,
	plugin_id, description, method_id, mime_types,		plugin_id.c_str(), description.c_str(),
			method_id, mime_types.c_str(),
	methodCounts[0], methodCounts[1], methodCounts[2],		methodCounts[0], methodCounts[1], methodCounts[2],
	methodCounts[3], methodCounts[4], methodCounts[5],		methodCounts[3], methodCounts[4], methodCounts[5],
	methodCounts[6], methodCounts[7], methodCounts[8],		methodCounts[6], methodCounts[7], methodCounts[8],
	methodCounts[9], methodCounts[10], methodCounts[11],		methodCounts[9], methodCounts[10], methodCounts[11],
	methodCounts[12]);		methodCounts[12]);

	free(plugin_id);
	free(description);
	free(mime_types);
	return true;		return true;
	}		}

	} // namespace android		} // namespace android