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

am 887dcfef: Revert workaround for WVv9 netflix license issue on fugu and molly

Browse Source 
* commit '887dcfef6be049aba661a1ffdccbda84bf02a47c':
  Revert workaround for WVv9 netflix license issue on fugu and molly
This commit is contained in:
Jeff Tinker
2014-09-08 21:16:01 +00:00
committed by Android Git Automerger
parent ef8f1f21c6 887dcfef6b
commit 49450b8f52
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libwvdrmengine/cdm/core/src/license.cpp
View File

@@ -286,12 +286,6 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
client_id->mutable_client_capabilities();
bool supports_usage_information;
if (session_->UsageInformationSupport(&supports_usage_information)) {
#if 1 // Temporary workaround for b/16994418
std::string value;
if (Properties::GetModelName(&value) && (value == "ADT-1" || value == "fugu")) {
supports_usage_information = false;
}
#endif
client_capabilities->set_session_token(supports_usage_information);
}
@@ -334,19 +328,8 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
uint32_t version = 0;
if (session_->GetApiVersion(&version)) {
#if 1 // Temporary workaround for b/16994418
std::string value;
bool set_api_version = true;
if (Properties::GetModelName(&value) && (value == "ADT-1" || value == "fugu")) {
set_api_version = false;
}
if (set_api_version) {
client_capabilities->set_oem_crypto_api_version(version);
}
#else
client_capabilities->set_oem_crypto_api_version(version);
#endif
}
if (privacy_mode_enabled) {
EncryptedClientIdentification* encrypted_client_id =