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

Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev

Browse Source
This commit is contained in:
Edwin Wong
2020-03-14 00:01:36 +00:00
committed by Android (Google) Code Review
parent 587f488ac1 a66d2b392e
commit 53f52cef0b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,11 +334,13 @@ Return<void> WVDrmPlugin::openSession_1_1(
hidl_vec<uint8_t> hSessionId = toHidlVec(sessionId); hidl_vec<uint8_t> hSessionId = toHidlVec(sessionId);
if (Status::OK == status) { if (Status::OK == status) {
SecurityLevel currentSecurityLevel = SecurityLevel::UNKNOWN; SecurityLevel currentSecurityLevel = SecurityLevel::UNKNOWN;
Return<void> hResult = getSecurityLevel(hSessionId, [&](Status status, SecurityLevel hSecurityLevel) { Return<void> hResult = getSecurityLevel(
hSessionId, [&](Status gslStatus, SecurityLevel hSecurityLevel) {
currentSecurityLevel = hSecurityLevel; currentSecurityLevel = hSecurityLevel;
if (Status::OK != status || requestedLevel != hSecurityLevel) { if (Status::OK != gslStatus || requestedLevel != hSecurityLevel) {
ALOGE("Failed to open session with the requested security level=%d", requestedLevel); ALOGE("Failed to open session with the requested security level=%d", requestedLevel);
if (Status::OK != closeSession(hSessionId)) sessionId.clear(); closeSession(hSessionId);
sessionId.clear();
} }
}); });
if (!hResult.isOk() || (requestedLevel != currentSecurityLevel)) { if (!hResult.isOk() || (requestedLevel != currentSecurityLevel)) {