commit 51da506d87b071ea01bc8f4707a2045869394e83
author James Dong <jdong@google.com> Thu Jun 17 12:23:48 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 17 12:23:48 2010 -0700
tree 57a4332d2e3eb40ed51f12faea92cdb6d7a409a8
parent bb045607843cc02e9567877e226a5fd803f654bf
parent e32283b15bbd60179424bdc740a4e4932da4c61e

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.

media/libstagefright/Prefetcher.cpp

diff --git a/media/libstagefright/Prefetcher.cpp b/media/libstagefright/Prefetcher.cpp
index b6ed56b..650a9f9 100644
--- a/media/libstagefright/Prefetcher.cpp
+++ b/media/libstagefright/Prefetcher.cpp
@@ -148,8 +148,10 @@
             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) {