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

* commit 'fa3098ad0781747fb9c1c60f71aa372c1a26018e':
  Workaround WVv9 netflix license issue on fugu
This commit is contained in:
Jeff Tinker
2014-08-28 23:18:33 +00:00
committed by Android Git Automerger

View File

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