commit 30d5ca398da4d6f417fe7c000dc9b20ae6ad8e37
author Andreas Huber <andih@google.com> Fri Jun 11 16:01:34 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 11 16:01:34 2010 -0700
tree 22e24dadad9c3f6a5febecfefce3befaa59c1372
parent 835f6999b8ecab8aec1f7f5cdbcbd42955d4a51e
parent df60830a42580af976b0fc88784d1d32191bd1d7

am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread

Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'

* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
  Must hold lock here...

media/libstagefright/NuCachedSource2.cpp

diff --git a/media/libstagefright/NuCachedSource2.cpp b/media/libstagefright/NuCachedSource2.cpp
index 6727c73..f29e7fb 100644
--- a/media/libstagefright/NuCachedSource2.cpp
+++ b/media/libstagefright/NuCachedSource2.cpp
@@ -267,6 +267,7 @@
             mFetching = false;
         }
     } else {
+        Mutex::Autolock autoLock(mLock);
         restartPrefetcherIfNecessary_l();
     }