am b445a1fe: Workaround for casting and playback failures

* commit 'b445a1fef24659c209e35e351ab8b7d297c35ee7':
  Workaround for casting and playback failures
This commit is contained in:
Jeff Tinker
2014-08-21 04:19:53 +00:00
committed by Android Git Automerger

View File

@@ -286,6 +286,12 @@ 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") {
supports_usage_information = false;
}
#endif
client_capabilities->set_session_token(supports_usage_information);
}
@@ -328,7 +334,18 @@ 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") {
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) {