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

Revert workaround for WVv9 netflix license issue on fugu and molly

Browse Source 
related-to-bug: 17212907

Change-Id: I9a6eed207f8fbdbd621b9ecde2cb99112f02e9fa
This commit is contained in:
Jeff Tinker
2014-09-08 11:47:07 -07:00
parent 457998d677
commit 887dcfef6b
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(); client_id->mutable_client_capabilities();
bool supports_usage_information; bool supports_usage_information;
if (session_->UsageInformationSupport(&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); client_capabilities->set_session_token(supports_usage_information);
} }
@@ -334,18 +328,7 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
uint32_t version = 0; uint32_t version = 0;
if (session_->GetApiVersion(&version)) { 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); client_capabilities->set_oem_crypto_api_version(version);
#endif
} }
if (privacy_mode_enabled) { if (privacy_mode_enabled) {