Merge "Add property to query SRM support and version."

This commit is contained in:
Edwin Wong
2017-07-14 17:25:29 +00:00
committed by Android (Google) Code Review
6 changed files with 69 additions and 2 deletions

View File

@@ -683,6 +683,10 @@ Return<void> WVDrmPlugin::getPropertyString(const hidl_string& propertyName,
value = mPropertySet.app_id().c_str();
} else if (name == "origin") {
value = mCdmIdentifierBuilder.origin().c_str();
} else if (name == "CurrentSRMVersion") {
status = queryProperty(wvcdm::QUERY_KEY_CURRENT_SRM_VERSION, value);
} else if (name == "SRMUpdateSupport") {
status = queryProperty(wvcdm::QUERY_KEY_SRM_UPDATE_SUPPORT, value);
} else {
ALOGE("App requested unknown string property %s", name.c_str());
status = android::ERROR_DRM_CANNOT_HANDLE;