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

Revert "Create unique cdm engines per WVDrmPlugin instance"

Browse Source 
This change introduced b/77618383, need to revert.

This reverts commit 58234a69f2.

Change-Id: Ie7d515bcd94f2dcee6fa9b885cd0441845c82c22

Bug: 77618383
This commit is contained in:
Jeff Tinker
2018-04-05 17:56:43 +00:00
committed by Patrick Egloff
parent 58234a69f2
commit 90441e24df
11 changed files with 198 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,7 +392,7 @@ status_t WVDrmPlugin::provideProvisionResponse(
}
CdmProvisioningResponse cdmResponse(response.begin(), response.end());
if (cdmResponse == kSpecialUnprovisionResponse) {
if (mCdmIdentifier.IsEquivalentToDefault()) {
if (mCdmIdentifier == kDefaultCdmIdentifier) {
return kErrorNoOriginSpecified;
}
return unprovision(mCdmIdentifier);
@@ -540,14 +540,9 @@ status_t WVDrmPlugin::getPropertyByteArray(const String8& name,
} else if (name == "serviceCertificate") {
value = ToVector(mPropertySet.service_certificate());
} else if (name == "metrics") {
std::string serialized_metrics;
drm_metrics::WvCdmMetrics metrics;
mCDM->GetMetrics(mCdmIdentifier, &metrics);
if (!metrics.SerializeToString(&serialized_metrics)) {
return android::ERROR_DRM_UNKNOWN;
} else {
value = ToVector(serialized_metrics);
}
std::string metrics_value;
mCDM->GetSerializedMetrics(&metrics_value);
value = ToVector(metrics_value);
} else {
ALOGE("App requested unknown byte array property %s", name.string());
return android::ERROR_DRM_CANNOT_HANDLE;