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

Merge "Workaround WVv9 netflix license issue on fugu" into lmp-dev

Browse Source
This commit is contained in:
Jeff Tinker
2014-08-28 22:35:27 +00:00
committed by Android (Google) Code Review
parent a9071cd4bd 14460bd66e
commit fa3098ad07
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,7 +288,7 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
if (session_->UsageInformationSupport(&supports_usage_information)) { if (session_->UsageInformationSupport(&supports_usage_information)) {
#if 1 // Temporary workaround for b/16994418 #if 1 // Temporary workaround for b/16994418
std::string value; std::string value;
if (Properties::GetModelName(&value) && value == "ADT-1") { if (Properties::GetModelName(&value) && (value == "ADT-1" || value == "fugu")) {
supports_usage_information = false; supports_usage_information = false;
} }
#endif #endif
@@ -337,7 +337,7 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
#if 1 // Temporary workaround for b/16994418 #if 1 // Temporary workaround for b/16994418
std::string value; std::string value;
bool set_api_version = true; bool set_api_version = true;
if (Properties::GetModelName(&value) && value == "ADT-1") { if (Properties::GetModelName(&value) && (value == "ADT-1" || value == "fugu")) {
set_api_version = false; set_api_version = false;
} }
if (set_api_version) { if (set_api_version) {