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

Author: James Dong

media/libstagefright/Prefetcher.cpp

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