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

Address deadlock

Browse Source 
am: d401baa236

Change-Id: Idfa0ee7dc493cc40a0c2500e8377257ce6dcbc80
This commit is contained in:
Rahul Frias
2018-05-30 00:01:12 -07:00
committed by android-build-merger
parent b94b13107d d401baa236
commit 2d7e47508b
1 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1655,13 +1655,15 @@ void CdmEngine::OnTimerEvent() {
bool is_initial_usage_update = false;
bool is_usage_update_needed = false;
{
AutoLock lock(session_map_lock_);
CdmSessionList sessions;
session_map_.GetSessionList(sessions);
while (!sessions.empty()) {
is_initial_usage_update =
is_initial_usage_update || sessions.front()->is_initial_usage_update();
is_initial_usage_update ||
sessions.front()->is_initial_usage_update();
is_usage_update_needed =
is_usage_update_needed || sessions.front()->is_usage_update_needed();
@@ -1703,6 +1705,7 @@ void CdmEngine::OnTimerEvent() {
}
}
}
}
CloseExpiredReleaseSessions();
}