fix for b/4126624 Widevine DRM client not sending heartbeats

Added some missing parameters to the heartbeat message, found in end-to-end
testing with youtube.  Also enabled heartbeats on client builds.

Change-Id: I445fb0cb168e63a041f0ecf828eaad493143a648

proprietary/drmwvmplugin/include/WVDRMPluginAPI.h

@@ -72,7 +72,11 @@ class WVDRMPluginAPI {
         EventType_RightsRemoved,
 
         EventType_HeartbeatServer,
-        EventType_HeartbeatPeriod
+        EventType_HeartbeatPeriod,
+        EventType_AssetId,
+        EventType_DeviceId,
+        EventType_StreamId,
+        EventType_UserData
     };
 
     enum EventDestination {

proprietary/drmwvmplugin/include/WVMDrmPlugin.h

@@ -117,7 +117,11 @@ protected:
 
     enum MessageType {
         MessageType_HeartbeatServer = 4000,
-        MessageType_HeartbeatPeriod = 4001
+        MessageType_HeartbeatPeriod = 4001,
+        MessageType_AssetId = 4002,
+        MessageType_DeviceId = 4003,
+        MessageType_StreamId = 4004,
+        MessageType_UserData = 4005
     };
 
 private:

proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp

@@ -178,6 +178,18 @@ bool WVMDrmPlugin::SendEvent(WVDRMPluginAPI::EventType type,
     case WVDRMPluginAPI::EventType_HeartbeatPeriod:
         code = MessageType_HeartbeatPeriod;
         break;
+    case WVDRMPluginAPI::EventType_AssetId:
+        code = MessageType_AssetId;
+        break;
+    case WVDRMPluginAPI::EventType_DeviceId:
+        code = MessageType_DeviceId;
+        break;
+    case WVDRMPluginAPI::EventType_StreamId:
+        code = MessageType_StreamId;
+        break;
+    case WVDRMPluginAPI::EventType_UserData:
+        code = MessageType_UserData;
+        break;
     default:
         break;
     }