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

Commit 49ed2b6b authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "IDataSource no longer has DrmInitialization"

parents 2861256e 8b755f15

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