Merge "Fix compile errors related to adding new MediaDrm methods"

This commit is contained in:
TreeHugger Robot
2018-01-23 17:07:39 +00:00
committed by Android (Google) Code Review

View File

@@ -923,14 +923,14 @@ void WVDrmPlugin::OnExpirationUpdate(const CdmSessionId& cdmSessionId,
status_t WVDrmPlugin::queryProperty(const std::string& property,
std::string& stringValue) const {
SecurityLevel securityLevel =
wvcdm::SecurityLevel securityLevel =
mPropertySet.security_level().compare(QUERY_VALUE_SECURITY_LEVEL_L3) == 0
? kLevel3
: kLevelDefault;
return queryProperty(securityLevel, property, stringValue);
}
status_t WVDrmPlugin::queryProperty(SecurityLevel securityLevel,
status_t WVDrmPlugin::queryProperty(wvcdm::SecurityLevel securityLevel,
const std::string& property,
std::string& stringValue) const {
CdmResponseType res =