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

Merge "Close CDM sessions only if opened" into pi-dev

Browse Source 
am: aa183af75b

Change-Id: I1d89fe1f4d03e77534fb4cc9fb7b7d65ec38165c
This commit is contained in:
Rahul Frias
2018-05-09 15:13:38 -07:00
committed by android-build-merger
parent baa3ba92fb aa183af75b
commit 1a84f8eac9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -142,14 +142,16 @@ WVDrmPlugin::~WVDrmPlugin() {
}
}
mCryptoSessions.clear();
CdmIdentifier identifier;
Status status = mCdmIdentifierBuilder.getCdmIdentifier(&identifier);
if (status != Status::OK) {
ALOGE("Failed to get cdm identifier %d", status);
} else {
status = mapCdmResponseType(mCDM->CloseCdm(identifier));
if (mCdmIdentifierBuilder.is_sealed()) {
CdmIdentifier identifier;
Status status = mCdmIdentifierBuilder.getCdmIdentifier(&identifier);
if (status != Status::OK) {
ALOGE("Failed to close cdm. status %d", status);
ALOGE("Failed to get cdm identifier %d", status);
} else {
status = mapCdmResponseType(mCDM->CloseCdm(identifier));
if (status != Status::OK) {
ALOGE("Failed to close cdm. status %d", status);
}
}
}
}