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

Commit 51da506d authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 39e876ad: Merge "When filling the cache, we always time out waiting for a... 

am 39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo

Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.
parents bb045607 e32283b1

media/libstagefright/Prefetcher.cpp

+3 −1
Original line number Diff line number Diff line
@@ -148,8 +148,10 @@ void Prefetcher::threadFunc() { 
            if (mDone) {

                break;

            }



            mCondition.waitRelative(

                    mLock, fillingCache ? 10000000ll : 1000000000ll);

                    mLock, fillingCache ? 1ll : 1000000000ll);





            ssize_t minIndex = -1;

            for (size_t i = 0; i < mSources.size(); ++i) {