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

Commit 6c3f60e3 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 399792b8: am 06ac0399: am b676b73e: Merge "When http streaming and... 

am 399792b8: am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1

* commit '399792b8':
  When http streaming and Content-Length is unknown, make sure to return all
parents 284f965a 399792b8

media/libstagefright/NuHTTPDataSource.cpp

+8 −1
Original line number Diff line number Diff line
@@ -420,9 +420,16 @@ ssize_t NuHTTPDataSource::readAt(off64_t offset, void *data, size_t size) { 
            internalRead((uint8_t *)data + numBytesRead, size - numBytesRead);



        if (n < 0) {

            if (numBytesRead == 0 || mContentLengthValid) {

                return n;

            }



            // If there was an error we want to at least return the data

            // we've already successfully read. The next call to read will

            // then return the error.

            n = 0;

        }



        int64_t delayUs = ALooper::GetNowUs() - startTimeUs;

        addBandwidthMeasurement_l(n, delayUs);