Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev

am: e7982e05f6

Change-Id: I7376c0f985f1a625190481e134b24501e26ab7d2

media/jni/android_media_MediaDataSource.cpp

@@ -26,6 +26,7 @@
 #include "JNIHelp.h"
 
 #include <binder/MemoryDealer.h>
+#include <drm/drm_framework_common.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <nativehelper/ScopedLocalRef.h>
 
@@ -159,4 +160,8 @@ String8 JMediaDataSource::toString() {
     return String8::format("JMediaDataSource(pid %d, uid %d)", getpid(), getuid());
 }
 
+sp<DecryptHandle> JMediaDataSource::DrmInitialization(const char * /* mime */) {
+    return NULL;
+}
+
 }  // namespace android

media/jni/android_media_MediaDataSource.h

@@ -47,6 +47,7 @@ public:
     virtual void close();
     virtual uint32_t getFlags();
     virtual String8 toString();
+    virtual sp<DecryptHandle> DrmInitialization(const char *mime);
 
 private:
     // Protect all member variables with mLock because this object will be