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 am: aa183af75b

Browse Source 
am: 1a84f8eac9

Change-Id: Icb92dd93b0864631ee89f0856b2cf7f4ddac1336
This commit is contained in:
Rahul Frias
2018-05-09 15:35:13 -07:00
committed by android-build-merger
parent 87689ed4d4 1a84f8eac9
commit 4a72ac6afa
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(); mCryptoSessions.clear();
CdmIdentifier identifier; if (mCdmIdentifierBuilder.is_sealed()) {
Status status = mCdmIdentifierBuilder.getCdmIdentifier(&identifier); CdmIdentifier identifier;
if (status != Status::OK) { Status status = mCdmIdentifierBuilder.getCdmIdentifier(&identifier);
ALOGE("Failed to get cdm identifier %d", status);
} else {
status = mapCdmResponseType(mCDM->CloseCdm(identifier));
if (status != Status::OK) { 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);
}
} }
} }
} }