Snap for 4813226 from d401baa236 to pi-release
am: 72703b2740
Change-Id: Ieedb899a3fc60df3d78eeb6e265a691d323fae5d
This commit is contained in:
committed by
android-build-merger
commit
49fb295f39
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user