Merge "Close CDM sessions only if opened" into pi-dev am: aa183af75b
am: 1a84f8eac9
Change-Id: Icb92dd93b0864631ee89f0856b2cf7f4ddac1336
This commit is contained in:
@@ -142,6 +142,7 @@ WVDrmPlugin::~WVDrmPlugin() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
mCryptoSessions.clear();
|
mCryptoSessions.clear();
|
||||||
|
if (mCdmIdentifierBuilder.is_sealed()) {
|
||||||
CdmIdentifier identifier;
|
CdmIdentifier identifier;
|
||||||
Status status = mCdmIdentifierBuilder.getCdmIdentifier(&identifier);
|
Status status = mCdmIdentifierBuilder.getCdmIdentifier(&identifier);
|
||||||
if (status != Status::OK) {
|
if (status != Status::OK) {
|
||||||
@@ -152,6 +153,7 @@ WVDrmPlugin::~WVDrmPlugin() {
|
|||||||
ALOGE("Failed to close cdm. status %d", status);
|
ALOGE("Failed to close cdm. status %d", status);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Status WVDrmPlugin::openSessionCommon(std::vector<uint8_t>& sessionId) {
|
Status WVDrmPlugin::openSessionCommon(std::vector<uint8_t>& sessionId) {
|
||||||
|
|||||||
Reference in New Issue
Block a user