Merge "libmediadrm: log uuid on errors" into sc-dev (a3a070cc) · Commits · e / os / android_frameworks_av

drm/libmediadrm/DrmHal.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -16,13 +16,9 @@

		//#define LOG_NDEBUG 0
		#define LOG_TAG "DrmHal"
		#include <iomanip>

		#include <utils/Log.h>

		#include <android/binder_manager.h>

		#include <aidl/android/media/BnResourceManagerClient.h>
		#include <android/binder_manager.h>
		#include <android/hardware/drm/1.2/types.h>
		#include <android/hidl/manager/1.2/IServiceManager.h>
		#include <hidl/ServiceManagement.h>
		@@ -40,7 +36,9 @@
		#include <mediadrm/DrmSessionManager.h>
		#include <mediadrm/IDrmMetricsConsumer.h>
		#include <mediadrm/DrmUtils.h>
		#include <utils/Log.h>

		#include <iomanip>
		#include <vector>

		using drm::V1_0::KeyedVector;
		@@ -364,7 +362,7 @@ sp<IDrmPlugin> DrmHal::makeDrmPlugin(const sp<IDrmFactory>& factory,
		Return<void> hResult = factory->createPlugin(uuid, appPackageName.string(),
		[&](Status status, const sp<IDrmPlugin>& hPlugin) {
		if (status != Status::OK) {
		DrmUtils::LOG2BE("Failed to make drm plugin: %d", status);
		DrmUtils::LOG2BE(uuid, "Failed to make drm plugin: %d", status);
		return;
		}
		plugin = hPlugin;
		@@ -372,7 +370,8 @@ sp<IDrmPlugin> DrmHal::makeDrmPlugin(const sp<IDrmFactory>& factory,
		);

		if (!hResult.isOk()) {
		DrmUtils::LOG2BE("createPlugin remote call failed");
		DrmUtils::LOG2BE(uuid, "createPlugin remote call failed: %s",
		hResult.description().c_str());
		}

		return plugin;
		@@ -580,6 +579,7 @@ status_t DrmHal::createPlugin(const uint8_t uuid[16],
		}

		if (mPlugin == NULL) {
		DrmUtils::LOG2BE(uuid, "No supported hal instance found");
		mInitCheck = ERROR_UNSUPPORTED;
		} else {
		mInitCheck = OK;

+2 −2

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ sp<::V1_0::IDrmPlugin> MakeDrmPlugin(const sp<::V1_0::IDrmFactory> &factory,
		factory->createPlugin(toHidlArray16(uuid), hidl_string(appPackageName),
		[&](::V1_0::Status status, const sp<::V1_0::IDrmPlugin> &hPlugin) {
		if (status != ::V1_0::Status::OK) {
		LOG2BE("MakeDrmPlugin failed: %d", status);
		LOG2BE(uuid, "MakeDrmPlugin failed: %d", status);
		return;
		}
		plugin = hPlugin;
		@@ -123,7 +123,7 @@ sp<::V1_0::ICryptoPlugin> MakeCryptoPlugin(const sp<::V1_0::ICryptoFactory> &fac
		factory->createPlugin(toHidlArray16(uuid), toHidlVec(initData, initDataSize),
		[&](::V1_0::Status status, const sp<::V1_0::ICryptoPlugin> &hPlugin) {
		if (status != ::V1_0::Status::OK) {
		LOG2BE("MakeCryptoPlugin failed: %d", status);
		LOG2BE(uuid, "MakeCryptoPlugin failed: %d", status);
		return;
		}
		plugin = hPlugin;

+14 −1

Original line number	Diff line number	Diff line
		@@ -33,8 +33,10 @@
		#include <cstdint>
		#include <ctime>
		#include <deque>
		#include <endian.h>
		#include <iterator>
		#include <mutex>
		#include <string>
		#include <vector>


		@@ -88,6 +90,14 @@ void LogToBuffer(android_LogPriority level, const char *fmt, Args... args) {
		}
		}

		template <typename... Args>
		void LogToBuffer(android_LogPriority level, const uint8_t uuid[16], const char *fmt, Args... args) {
		const uint64_t* uuid2 = reinterpret_cast<const uint64_t*>(uuid);
		std::string uuidFmt("uuid=[%lx %lx] ");
		uuidFmt += fmt;
		LogToBuffer(level, uuidFmt.c_str(), htobe64(uuid2[0]), htobe64(uuid2[1]), args...);
		}

		#ifndef LOG2BE
		#define LOG2BE(...) LogToBuffer(ANDROID_LOG_ERROR, __VA_ARGS__)
		#define LOG2BW(...) LogToBuffer(ANDROID_LOG_WARN, __VA_ARGS__)
		@@ -196,10 +206,13 @@ status_t GetLogMessages(const sp<U> &obj, Vector<::V1_4::LogMessage> &logs) {
		hResult = plugin->getLogMessages(cb);
		}
		if (!hResult.isOk()) {
		LOG2BW("%s::getLogMessages remote call failed", T::descriptor);
		LOG2BW("%s::getLogMessages remote call failed %s",
		T::descriptor, hResult.description().c_str());
		}

		auto allLogs(gLogBuf.getLogs());
		LOG2BI("framework logs size %zu; plugin logs size %zu",
		allLogs.size(), pluginLogs.size());
		std::copy(pluginLogs.begin(), pluginLogs.end(), std::back_inserter(allLogs));
		std::sort(allLogs.begin(), allLogs.end(),
		[](const ::V1_4::LogMessage &a, const ::V1_4::LogMessage &b) {