From 5d6c12ff5d3c13def0c01e44107ac4d828a72927 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Wed, 9 Jan 2019 18:04:59 -0800 Subject: [PATCH] Add additional logging to Cdm Engine [ Merge of http://go/wvgerrit/69965 ] Bug: 120786527 Test: WV unit/integration tests Change-Id: I8fea89b25435c3a3b632155fe6a2b07349b63a19 --- libwvdrmengine/cdm/core/src/cdm_engine.cpp | 53 ++++++++++++++-------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp index c41748ed..b036ec43 100644 --- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp @@ -156,7 +156,7 @@ CdmResponseType CdmEngine::OpenSession( CdmResponseType CdmEngine::OpenKeySetSession( const CdmKeySetId& key_set_id, CdmClientPropertySet* property_set, WvCdmEventListener* event_listener) { - LOGI("CdmEngine::OpenKeySetSession"); + LOGI("CdmEngine::OpenKeySetSession: %s", key_set_id.c_str()); if (key_set_id.empty()) { LOGE("CdmEngine::OpenKeySetSession: invalid key set id"); @@ -198,7 +198,7 @@ CdmResponseType CdmEngine::CloseSession(const CdmSessionId& session_id) { } CdmResponseType CdmEngine::CloseKeySetSession(const CdmKeySetId& key_set_id) { - LOGI("CdmEngine::CloseKeySetSession"); + LOGI("CdmEngine::CloseKeySetSession: %s", key_set_id.c_str()); CdmSessionId session_id; { @@ -231,7 +231,7 @@ CdmResponseType CdmEngine::GenerateKeyRequest( const CdmSessionId& session_id, const CdmKeySetId& key_set_id, const InitializationData& init_data, const CdmLicenseType license_type, CdmAppParameterMap& app_parameters, CdmKeyRequest* key_request) { - LOGI("CdmEngine::GenerateKeyRequest"); + LOGI("CdmEngine::GenerateKeyRequest: %s", session_id.c_str()); CdmSessionId id = session_id; CdmResponseType sts; @@ -244,6 +244,7 @@ CdmResponseType CdmEngine::GenerateKeyRequest( LOGE("CdmEngine::GenerateKeyRequest: invalid key set ID"); return EMPTY_KEYSET_ID_ENG_2; } + LOGI("CdmEngine::GenerateKeyRequest: key set ID: %s", key_set_id.c_str()); if (!session_id.empty()) { LOGE("CdmEngine::GenerateKeyRequest: invalid session ID = %s", @@ -313,7 +314,7 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, const CdmKeyResponse& key_data, CdmLicenseType* license_type, CdmKeySetId* key_set_id) { - LOGI("CdmEngine::AddKey"); + LOGI("CdmEngine::AddKey: %s", session_id.c_str()); if (license_type == nullptr) { LOGE("CdmEngine::AddKey: license_type cannot be null."); return PARAMETER_NULL; @@ -373,6 +374,7 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, if ((session->is_offline() || session->has_provider_session_token()) && !license_type_release) { *key_set_id = session->key_set_id(); + LOGI("CdmEngine::AddKey: key set ID: %s", key_set_id->c_str()); } else { key_set_id->clear(); } @@ -394,7 +396,8 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, CdmResponseType CdmEngine::RestoreKey(const CdmSessionId& session_id, const CdmKeySetId& key_set_id) { - LOGI("CdmEngine::RestoreKey"); + LOGI("CdmEngine::RestoreKey: session ID: %s, key set ID: %s", + session_id.c_str(), key_set_id.c_str()); if (key_set_id.empty()) { LOGI("CdmEngine::RestoreKey: invalid key set id"); @@ -422,7 +425,7 @@ CdmResponseType CdmEngine::RestoreKey(const CdmSessionId& session_id, } CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) { - LOGI("CdmEngine::RemoveKeys"); + LOGI("CdmEngine::RemoveKeys: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { @@ -437,7 +440,7 @@ CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) { } CdmResponseType CdmEngine::RemoveLicense(const CdmSessionId& session_id) { - LOGI("CdmEngine::RemoveLicense"); + LOGI("CdmEngine::RemoveLicense: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { @@ -450,7 +453,7 @@ CdmResponseType CdmEngine::RemoveLicense(const CdmSessionId& session_id) { CdmResponseType CdmEngine::GenerateRenewalRequest( const CdmSessionId& session_id, CdmKeyRequest* key_request) { - LOGI("CdmEngine::GenerateRenewalRequest"); + LOGI("CdmEngine::GenerateRenewalRequest: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { @@ -479,7 +482,7 @@ CdmResponseType CdmEngine::GenerateRenewalRequest( CdmResponseType CdmEngine::RenewKey(const CdmSessionId& session_id, const CdmKeyResponse& key_data) { - LOGI("CdmEngine::RenewKey"); + LOGI("CdmEngine::RenewKey: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { @@ -699,7 +702,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, CdmResponseType CdmEngine::QuerySessionStatus(const CdmSessionId& session_id, CdmQueryMap* query_response) { - LOGI("CdmEngine::QuerySessionStatus"); + LOGI("CdmEngine::QuerySessionStatus: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { LOGE("CdmEngine::QuerySessionStatus: session_id not found = %s", @@ -710,7 +713,7 @@ CdmResponseType CdmEngine::QuerySessionStatus(const CdmSessionId& session_id, } bool CdmEngine::IsReleaseSession(const CdmSessionId& session_id) { - LOGI("CdmEngine::IsReleaseSession"); + LOGI("CdmEngine::IsReleaseSession: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { LOGE("CdmEngine::IsReleaseSession: session_id not found = %s", @@ -721,7 +724,7 @@ bool CdmEngine::IsReleaseSession(const CdmSessionId& session_id) { } bool CdmEngine::IsOfflineSession(const CdmSessionId& session_id) { - LOGI("CdmEngine::IsOfflineSession"); + LOGI("CdmEngine::IsOfflineSession: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { LOGE("CdmEngine::IsOfflineSession: session_id not found = %s", @@ -733,7 +736,7 @@ bool CdmEngine::IsOfflineSession(const CdmSessionId& session_id) { CdmResponseType CdmEngine::QueryKeyStatus(const CdmSessionId& session_id, CdmQueryMap* query_response) { - LOGI("CdmEngine::QueryKeyStatus"); + LOGI("CdmEngine::QueryKeyStatus: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { LOGE("CdmEngine::QueryKeyStatus: session_id not found = %s", @@ -746,7 +749,7 @@ CdmResponseType CdmEngine::QueryKeyStatus(const CdmSessionId& session_id, CdmResponseType CdmEngine::QueryKeyAllowedUsage(const CdmSessionId& session_id, const std::string& key_id, CdmKeyAllowedUsage* key_usage) { - LOGI("CdmEngine::QueryKeyAllowedUsage"); + LOGI("CdmEngine::QueryKeyAllowedUsage: %s", session_id.c_str()); if (!key_usage) { LOGE("CdmEngine::QueryKeyAllowedUsage: no response destination"); return PARAMETER_NULL; @@ -801,7 +804,7 @@ CdmResponseType CdmEngine::QueryKeyAllowedUsage(const std::string& key_id, CdmResponseType CdmEngine::QueryOemCryptoSessionId( const CdmSessionId& session_id, CdmQueryMap* query_response) { - LOGI("CdmEngine::QueryOemCryptoSessionId"); + LOGI("CdmEngine::QueryOemCryptoSessionId: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { LOGE("CdmEngine::QueryOemCryptoSessionId: session_id not found = %s", @@ -935,6 +938,7 @@ bool CdmEngine::IsProvisioned(CdmSecurityLevel security_level) { } CdmResponseType CdmEngine::Unprovision(CdmSecurityLevel security_level) { + LOGI("CdmEngine::Unprovision: security level: %d", security_level); // Devices with baked-in DRM certs cannot be reprovisioned and therefore must // not be unprovisioned. std::unique_ptr crypto_session( @@ -971,6 +975,7 @@ CdmResponseType CdmEngine::Unprovision(CdmSecurityLevel security_level) { } CdmResponseType CdmEngine::DeleteUsageTable(CdmSecurityLevel security_level) { + LOGI("CdmEngine::DeleteUsageTable: security level: %d", security_level); std::unique_ptr crypto_session( CryptoSession::MakeCryptoSession(metrics_.GetCryptoMetrics())); CdmResponseType status; @@ -1040,6 +1045,8 @@ CdmResponseType CdmEngine::ListUsageIds( CdmResponseType CdmEngine::DeleteUsageRecord(const std::string& app_id, CdmSecurityLevel security_level, const std::string& key_set_id) { + LOGI("CdmEngine::DeleteUsageRecord: %s, app ID: %s", key_set_id.c_str(), + app_id.c_str()); std::string provider_session_token; DeviceFiles handle(file_system_); @@ -1076,6 +1083,7 @@ CdmResponseType CdmEngine::DeleteUsageRecord(const std::string& app_id, CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, const CdmSecureStopId& ssid, CdmUsageInfo* usage_info) { + LOGI("CdmEngine::GetUsageInfo: %s", ssid.c_str()); if (NULL == usage_property_set_.get()) { usage_property_set_.reset(new UsagePropertySet()); } @@ -1148,6 +1156,7 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, CdmUsageInfo* usage_info) { + LOGI("CdmEngine::GetUsageInfo: %s", app_id.c_str()); // Return a random usage report from a random security level SecurityLevel security_level = ((rand() % 2) == 0) ? kLevelDefault : kLevel3; CdmResponseType status = UNKNOWN_ERROR; @@ -1176,6 +1185,8 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, SecurityLevel requested_security_level, CdmUsageInfo* usage_info) { + LOGI("CdmEngine::GetUsageInfo: %s, security level: %d", app_id.c_str(), + requested_security_level); if (NULL == usage_property_set_.get()) { usage_property_set_.reset(new UsagePropertySet()); } @@ -1247,6 +1258,8 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, CdmResponseType CdmEngine::RemoveAllUsageInfo( const std::string& app_id, CdmSecurityLevel security_level) { + LOGI("CdmEngine::RemoveAllUsageInfo: %s, security level: %d", + app_id.c_str(), security_level); DeviceFiles handle(file_system_); if (!handle.Init(security_level)) { LOGE("CdmEngine::RemoveAllUsageInfo: unable to initialize device files"); @@ -1278,6 +1291,7 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo( } CdmResponseType CdmEngine::RemoveAllUsageInfo(const std::string& app_id) { + LOGI("CdmEngine::RemoveAllUsageInfo: %s", app_id.c_str()); if (NULL == usage_property_set_.get()) { usage_property_set_.reset(new UsagePropertySet()); } @@ -1369,6 +1383,8 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo(const std::string& app_id) { CdmResponseType CdmEngine::RemoveUsageInfo( const std::string& app_id, const CdmSecureStopId& provider_session_token) { + LOGI("CdmEngine::RemoveUsageInfo: %s, PST: %s", app_id.c_str(), + provider_session_token.c_str()); if (NULL == usage_property_set_.get()) { usage_property_set_.reset(new UsagePropertySet()); } @@ -1446,6 +1462,7 @@ CdmResponseType CdmEngine::RemoveUsageInfo( CdmResponseType CdmEngine::ReleaseUsageInfo( const CdmUsageInfoReleaseMessage& message) { + LOGI("CdmEngine::ReleaseUsageInfo"); if (NULL == usage_session_.get()) { LOGE("CdmEngine::ReleaseUsageInfo: cdm session not initialized"); return RELEASE_USAGE_INFO_ERROR; @@ -1461,7 +1478,7 @@ CdmResponseType CdmEngine::ReleaseUsageInfo( CdmResponseType CdmEngine::LoadUsageSession(const CdmKeySetId& key_set_id, CdmKeyMessage* release_message) { - LOGI("CdmEngine::LoadUsageSession"); + LOGI("CdmEngine::LoadUsageSession: %s", key_set_id.c_str()); // This method is currently only used by the CE CDM, in which all session IDs // are key set IDs. assert(Properties::AlwaysUseKeySetIds()); @@ -1716,7 +1733,7 @@ CdmResponseType CdmEngine::SetDecryptHash( const CdmSessionId& session_id, uint32_t frame_number, const std::string& hash) { - LOGI("CdmEngine::SetDecryptHash"); + LOGI("CdmEngine::SetDecryptHash: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { return SESSION_NOT_FOUND_20; @@ -1727,7 +1744,7 @@ CdmResponseType CdmEngine::SetDecryptHash( CdmResponseType CdmEngine::GetDecryptHashError( const CdmSessionId& session_id, std::string* error_string) { - LOGI("CdmEngine::GetDecryptHashError"); + LOGI("CdmEngine::GetDecryptHashError: %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { return SESSION_NOT_FOUND_20;