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

Commit 53bebaf2 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

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

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

* commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8':
  Revert "Use pread() to get the decrypted data for container based DRM file."
parents 62bcf26e a2b2c9f9

media/libstagefright/NuHTTPDataSource.cpp

+0 −7
Original line number Diff line number Diff line
@@ -383,13 +383,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;