Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b755f15 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

IDataSource no longer has DrmInitialization 

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

Change-Id: I37e305bf9312f0f672447f003c7fac85d8914eb6
parent 5372c1cf

media/jni/android_media_MediaDataSource.cpp

+0 −5
Original line number Diff line number Diff line
@@ -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>
@@ -161,8 +160,4 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 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