am 968993cd: Allow Clearing of Privacy Cert

* commit '968993cd05b3c4da324a912a6ca3315bac9fc2b9': Allow Clearing of Privacy Cert
2015-06-19 18:01:10 +00:00
parent adc1250666 968993cd05
commit e0dca7b54a
1 changed files with 2 additions and 1 deletions
--- a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
@@ -585,7 +585,8 @@ status_t WVDrmPlugin::setPropertyByteArray(const String8& name,
                                           const Vector<uint8_t>& value) {
  if (name == "serviceCertificate") {
    std::string cert(value.begin(), value.end());
-    if (WvContentDecryptionModule::IsValidServiceCertificate(cert)) {
+    if (value.isEmpty() ||
+        WvContentDecryptionModule::IsValidServiceCertificate(cert)) {
      mPropertySet.set_service_certificate(cert);
    } else {
      return android::BAD_VALUE;