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

Commit 0474f567 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

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

am: 47efffff

Change-Id: I49c99beced2fefd0dd9f1ce8e7365e60c0834a7e
parents a47967b8 47efffff

media/jni/android_media_MediaDataSource.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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

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