commit 161405f66c6113950d6af352219c2b78ddf56203
author Marco Nelissen <marcone@google.com> Fri Nov 15 09:14:11 2019 -0800
committer Marco Nelissen <marcone@google.com> Tue Nov 19 12:23:45 2019 -0800
tree cb45505e9a903ecd14f5d2244360d102b670599d
parent 81200971e17130f58edd810c566cb054768ff487

IDataSource no longer has DrmInitialization

Test: atest cts/tests/tests/drm/src/android/drm/cts/DRMTest.java

Change-Id: I37e305bf9312f0f672447f003c7fac85d8914eb6

media/jni/android_media_MediaDataSource.cpp

diff --git a/media/jni/android_media_MediaDataSource.cpp b/media/jni/android_media_MediaDataSource.cpp
index 8c38d88..84a0e0d 100644
--- a/media/jni/android_media_MediaDataSource.cpp
+++ b/media/jni/android_media_MediaDataSource.cpp
@@ -26,7 +26,6 @@
 #include <nativehelper/JNIHelp.h>
 
 #include <binder/MemoryDealer.h>
-#include <drm/drm_framework_common.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <nativehelper/ScopedLocalRef.h>
 
@@ -160,8 +159,4 @@
     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

diff --git a/media/jni/android_media_MediaDataSource.h b/media/jni/android_media_MediaDataSource.h
index 39405d2..378baf4 100644
--- a/media/jni/android_media_MediaDataSource.h
+++ b/media/jni/android_media_MediaDataSource.h
@@ -47,7 +47,6 @@
     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