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 am: 53f52cef0b am: f0f5475c88

Browse Source 
Change-Id: Ib14fbac2d7f89189fc37a9778143f9a3a81cf998
This commit is contained in:
Automerger Merge Worker
2020-03-14 00:36:09 +00:00
parent 761ec158ba f0f5475c88
commit e5549a8fe4
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);
if (Status::OK == status) {
SecurityLevel currentSecurityLevel = SecurityLevel::UNKNOWN;
Return<void> hResult = getSecurityLevel(hSessionId, [&](Status status, SecurityLevel hSecurityLevel) {
Return<void> hResult = getSecurityLevel(
hSessionId, [&](Status gslStatus, SecurityLevel 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);
if (Status::OK != closeSession(hSessionId)) sessionId.clear();
closeSession(hSessionId);
sessionId.clear();
}
});
if (!hResult.isOk() || (requestedLevel != currentSecurityLevel)) {