widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Address review comments for OEMCrypto Build Information"

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2019-05-17 01:19:56 +00:00
committed by Android (Google) Code Review
parent fa60c58344 e4c7bc38f8
commit f3b65702ca
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/cdm/core/src/client_identification.cpp
View File

@@ -150,7 +150,12 @@ CdmResponseType ClientIdentification::Prepare(
client_info->set_name(kKeyOemCryptoSecurityPatchLevel); client_info->set_name(kKeyOemCryptoSecurityPatchLevel);
client_info->set_value( client_info->set_value(
std::to_string((uint32_t)crypto_session_->GetSecurityPatchLevel())); std::to_string((uint32_t)crypto_session_->GetSecurityPatchLevel()));
std::string oec_build_info;
if (crypto_session_->GetBuildInformation(&oec_build_info)) {
client_info = client_id->add_client_info();
client_info->set_name(kKeyOemCryptoBuildInformation);
client_info->set_value(oec_build_info);
}
if (!provider_client_token.empty()) { if (!provider_client_token.empty()) {
client_id->set_provider_client_token(provider_client_token); client_id->set_provider_client_token(provider_client_token);
} }
@@ -273,12 +278,6 @@ CdmResponseType ClientIdentification::Prepare(
client_capabilities->set_resource_rating_tier(tier); client_capabilities->set_resource_rating_tier(tier);
} }
} }
std::string info;
if (crypto_session_->GetBuildInformation(&info)) {
client_info = client_id->add_client_info();
client_info->set_name(kKeyOemCryptoBuildInformation);
client_info->set_value(info);
}
} }
return NO_ERROR; return NO_ERROR;