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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-23 17:07:39 +00:00
committed by Android (Google) Code Review
parent c58a0c62fe 87d58f85c1
commit 9876af2f96
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
View File

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