commit cc82dc6d500023eba6048616301a4b12682458db
author Jeff Tinker <jtinker@google.com> Fri Feb 08 10:18:35 2013 -0800
committer Jeff Tinker <jtinker@google.com> Wed Mar 13 13:39:48 2013 -0700
tree 1f36f887af92cb4bee147e962b85ce10f35d587a
parent c93484ab9fdf044fd32f2388a3ce29040d2ba319

Implementing MediaDrm APIs

Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 16f1317..ec6ace1 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -72,6 +72,7 @@
 #include <OMX.h>
 
 #include "Crypto.h"
+#include "Drm.h"
 #include "HDCP.h"
 #include "RemoteDisplay.h"
 
@@ -285,6 +286,10 @@
     return new Crypto;
 }
 
+sp<IDrm> MediaPlayerService::makeDrm() {
+    return new Drm;
+}
+
 sp<IHDCP> MediaPlayerService::makeHDCP(bool createEncryptionModule) {
     return new HDCP(createEncryptionModule);
 }