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

Commit 3b3012b6 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "IDataSource no longer has DrmInitialization" am: 3fd43520 

am: 0666df9f

Change-Id: Ic864ee46fe664765413de84b5da61d21995b9440
parents f85b6a2d 0666df9f

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>
@@ -160,8 +159,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