Fixes for b/4194032, b/4192318 and b/4190560

Found in online/offline testing with heartbeat server:

b/4194032 - when streaming playback is stopped the streaming license is not removed
b/4192318 - streaming licenses are allowing offline playback
b/4190560 - offline heartbeats stopping video playback

Change-Id: Iacf31f559d6b374752ca1b7f2b93d4ec8a4d7440
This commit is contained in:
Jeffrey Tinker
2011-03-30 10:21:18 -07:00
parent 3d69ec0ee0
commit 7c606db261
4 changed files with 4 additions and 4 deletions

View File

@@ -37,7 +37,7 @@ class WVDRMPluginAPI {
static WVDRMPluginAPI *create();
static void destroy(WVDRMPluginAPI *plugin);
virtual void OpenSession() = 0;
virtual void OpenSession(const char *uri) = 0;
virtual void CloseSession() = 0;
virtual bool IsSupportedMediaType(const char *uri) = 0;
@@ -77,7 +77,7 @@ class WVDRMPluginAPI {
EventType_DeviceId,
EventType_StreamId,
EventType_UserData
};
};
enum EventDestination {
EventDestination_JavaAPI,

View File

@@ -733,7 +733,7 @@ status_t WVMDrmPlugin::onOpenDecryptSession(
decryptHandle->status = DRM_NO_ERROR;
decryptHandle->decryptInfo = NULL;
mDrmPluginImpl->OpenSession();
mDrmPluginImpl->OpenSession(NULL);
result = DRM_NO_ERROR;
} else {
//LOGD("WVMDrmPlugin::onOpenDecryptSession - not Widevine media");
@@ -766,7 +766,7 @@ status_t WVMDrmPlugin::onOpenDecryptSession(
decryptHandle->status = DRM_NO_ERROR;
decryptHandle->decryptInfo = NULL;
mDrmPluginImpl->OpenSession();
mDrmPluginImpl->OpenSession(uri);
result = DRM_NO_ERROR;
} else {
//LOGD("WVMDrmPlugin::onOpenDecryptSession(uri) - not Widevine media");