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

Commit 8294aac2 authored by Gloria Wang's avatar Gloria Wang Committed by Android Git Automerger
Browse files

am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data... 

am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

* commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
parents b127de05 cb83fae8

media/libstagefright/NuHTTPDataSource.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -392,6 +392,13 @@ ssize_t NuHTTPDataSource::readAt(off64_t offset, void *data, size_t size) { 




    Mutex::Autolock autoLock(mLock);

    Mutex::Autolock autoLock(mLock);





    // if it's a DRM container based streaming, call pread() of the DRM plugin

    // to get the decrypted data

    if (mDecryptHandle != NULL && DecryptApiType::CONTAINER_BASED

            == mDecryptHandle->decryptApiType) {

        return mDrmManagerClient->pread(mDecryptHandle, data, size, offset);

    }



    if (offset != mOffset) {

    if (offset != mOffset) {

        String8 host = mHost;

        String8 host = mHost;

        String8 path = mPath;

        String8 path = mPath;