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

Commit 2de4113c authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the... 

am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
  Revert "Use pread() to get the decrypted data for container based DRM file."
parents 8d912373 53bebaf2

media/libstagefright/NuHTTPDataSource.cpp

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


    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) {

        String8 host = mHost;

        String8 path = mPath;