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

am 49e593d1: Stop policy timer before invoking session destructor

Browse Source 
* commit '49e593d12702a3ffd671402e585dc271cc72d65b':
  Stop policy timer before invoking session destructor
This commit is contained in:
Jeff Tinker
2013-10-30 11:10:54 -07:00
committed by Android Git Automerger
parent 022f09fe9a 49e593d127
commit 48b1acac38
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/include/cdm_engine.h
View File

@@ -114,7 +114,7 @@ class CdmEngine : public TimerHandler {
// timer related methods to drive policy decisions // timer related methods to drive policy decisions
virtual void EnablePolicyTimer(); virtual void EnablePolicyTimer();
virtual void DisablePolicyTimer(); virtual void DisablePolicyTimer(bool force);
virtual void OnTimerEvent(); virtual void OnTimerEvent();
virtual void OnKeyReleaseEvent(const CdmKeySetId& key_set_id); virtual void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);

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

@@ -29,6 +29,7 @@ CdmEngine::CdmEngine()
CdmEngine::~CdmEngine() { CdmEngine::~CdmEngine() {
CancelSessions(); CancelSessions();
DisablePolicyTimer(true);
CdmSessionMap::iterator i(sessions_.begin()); CdmSessionMap::iterator i(sessions_.begin());
for (; i != sessions_.end(); ++i) for (; i != sessions_.end(); ++i)
delete i->second; delete i->second;
@@ -98,9 +99,10 @@ CdmResponseType CdmEngine::CloseSession(const CdmSessionId& session_id) {
return KEY_ERROR; return KEY_ERROR;
} }
delete iter->second; CdmSession* session = iter->second;
sessions_.erase(session_id); sessions_.erase(session_id);
DisablePolicyTimer(); DisablePolicyTimer(false);
delete session;
return NO_ERROR; return NO_ERROR;
} }
@@ -295,7 +297,7 @@ CdmResponseType CdmEngine::CancelKeyRequest(const CdmSessionId& session_id) {
} }
// TODO(edwinwong, rfrias): unload keys here // TODO(edwinwong, rfrias): unload keys here
DisablePolicyTimer(); DisablePolicyTimer(false);
return NO_ERROR; return NO_ERROR;
} }
@@ -675,8 +677,8 @@ void CdmEngine::EnablePolicyTimer() {
policy_timer_.Start(this, kCdmPolicyTimerDurationSeconds); policy_timer_.Start(this, kCdmPolicyTimerDurationSeconds);
} }
void CdmEngine::DisablePolicyTimer() { void CdmEngine::DisablePolicyTimer(bool force) {
if (sessions_.size() == 0 && policy_timer_.IsRunning()) if ((sessions_.size() == 0 || force) && policy_timer_.IsRunning())
policy_timer_.Stop(); policy_timer_.Stop();
} }