From 968993cd05b3c4da324a912a6ca3315bac9fc2b9 Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Thu, 18 Jun 2015 18:47:41 -0700 Subject: [PATCH] Allow Clearing of Privacy Cert (This is a merge of http://go/wvgerrit/14782) The ability to clear the privacy cert after setting it was accidentally removed by adding validation, as an empty certificate is invalid. This restores the ability to clear the certificate by not validating if the value being set is empty. Bug: 21923281 Change-Id: Ibb57481a398c9599163ab3512125a9d5b5fcaab4 --- libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp index 9560dbb3..ccbe3860 100644 --- 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& 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;