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

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

Merge "Expand mediaextractor dumpsys" into nyc-dev 

am: aaacd001

* commit 'aaacd001':
  Expand mediaextractor dumpsys

Change-Id: Ie70b95d73a0994285c55dca1729cd782331b35bd
parents 306e7073 aaacd001

media/jni/android_media_MediaDataSource.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -155,4 +155,8 @@ uint32_t JMediaDataSource::getFlags() { 
    return 0;

    return 0;

}

}





String8 JMediaDataSource::toString() {

    return String8::format("JMediaDataSource(pid %d, uid %d)", getpid(), getuid());

}



}  // namespace android
 
}  // namespace android

media/jni/android_media_MediaDataSource.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ public: 
    virtual status_t getSize(off64_t* size);

    virtual status_t getSize(off64_t* size);

    virtual void close();

    virtual void close();

    virtual uint32_t getFlags();

    virtual uint32_t getFlags();

    virtual String8 toString();





private:

private:

    // Protect all member variables with mLock because this object will be

    // Protect all member variables with mLock because this object will be