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

am 968993cd: Allow Clearing of Privacy Cert

Browse Source 
* commit '968993cd05b3c4da324a912a6ca3315bac9fc2b9':
  Allow Clearing of Privacy Cert
This commit is contained in:
John "Juce" Bruce
2015-06-19 18:01:10 +00:00
committed by Android Git Automerger
parent adc1250666 968993cd05
commit e0dca7b54a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -585,7 +585,8 @@ status_t WVDrmPlugin::setPropertyByteArray(const String8& name,
const Vector<uint8_t>& value) { const Vector<uint8_t>& value) {
if (name == "serviceCertificate") { if (name == "serviceCertificate") {
std::string cert(value.begin(), value.end()); std::string cert(value.begin(), value.end());
if (WvContentDecryptionModule::IsValidServiceCertificate(cert)) { if (value.isEmpty() ||
WvContentDecryptionModule::IsValidServiceCertificate(cert)) {
mPropertySet.set_service_certificate(cert); mPropertySet.set_service_certificate(cert);
} else { } else {
return android::BAD_VALUE; return android::BAD_VALUE;