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

Snap for 8112519 from 8500365f8c to tm-release

Browse Source 
Change-Id: I8f0c868e7d5cbfb59d46a2029f7f2a0cc94f319e
This commit is contained in:
Android Build Coastguard Worker
2022-01-25 02:20:08 +00:00
parent 8a3b5ab3d8 8500365f8c
commit 2877d37ab9
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -396,7 +396,16 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id,
return EMPTY_KEY_DATA_1; return EMPTY_KEY_DATA_1;
} }
const CdmResponseType sts = session->AddKey(key_data); CdmResponseType sts = KEY_ADDED;
{
// TODO(rfrias): Refactor. For now lock while adding keys to prevent
// a race condition between this and the decryption thread. This may
// occur if |policy_timers_| is reset when PolicyEngine::SetLicense
// is called.
std::unique_lock<std::recursive_mutex> lock(session_map_lock_);
sts = session->AddKey(key_data);
}
if (sts == KEY_ADDED) { if (sts == KEY_ADDED) {
if (session->is_release()) { if (session->is_release()) {
*license_type = kLicenseTypeRelease; *license_type = kLicenseTypeRelease;
@@ -464,6 +473,7 @@ CdmResponseType CdmEngine::RestoreKey(const CdmSessionId& session_id,
CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) { CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) {
LOGI("session_id = %s", IdToString(session_id)); LOGI("session_id = %s", IdToString(session_id));
std::shared_ptr<CdmSession> session; std::shared_ptr<CdmSession> session;
std::unique_lock<std::recursive_mutex> lock(session_map_lock_);
if (!session_map_.FindSession(session_id, &session)) { if (!session_map_.FindSession(session_id, &session)) {
LOGE("Session not found: session_id = %s", IdToString(session_id)); LOGE("Session not found: session_id = %s", IdToString(session_id));
return SESSION_NOT_FOUND_5; return SESSION_NOT_FOUND_5;
@@ -475,6 +485,7 @@ CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) {
CdmResponseType CdmEngine::RemoveLicense(const CdmSessionId& session_id) { CdmResponseType CdmEngine::RemoveLicense(const CdmSessionId& session_id) {
LOGI("session_id = %s", IdToString(session_id)); LOGI("session_id = %s", IdToString(session_id));
std::shared_ptr<CdmSession> session; std::shared_ptr<CdmSession> session;
std::unique_lock<std::recursive_mutex> lock(session_map_lock_);
if (!session_map_.FindSession(session_id, &session)) { if (!session_map_.FindSession(session_id, &session)) {
LOGE("Session not found: session_id = %s", IdToString(session_id)); LOGE("Session not found: session_id = %s", IdToString(session_id));
return SESSION_NOT_FOUND_19; return SESSION_NOT_FOUND_19;