Merge "Fixes for b/4194032, b/4192318 and b/4190560" into honeycomb-mr1

proprietary/drmwvmplugin/include/WVDRMPluginAPI.h

@@ -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,

proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp

@@ -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");