summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-06-11 15:58:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-06-11 15:58:19 -0700
commita1ad27130107b4377cc94b310a1e6c51d4b17cde (patch)
tree9d69419eb1df53b9aca2ab5f021045c48fad6b0d /media
parent623a0de03d72c17b4cf0701280c6cb1df365ea6c (diff)
parentd17875a226491e3de60fa32d764a4cc92de7f949 (diff)
downloadframeworks_av-a1ad27130107b4377cc94b310a1e6c51d4b17cde.zip
frameworks_av-a1ad27130107b4377cc94b310a1e6c51d4b17cde.tar.gz
frameworks_av-a1ad27130107b4377cc94b310a1e6c51d4b17cde.tar.bz2
Merge "Must hold lock here..." into gingerbread
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/NuCachedSource2.cpp1
1 files changed, 1 insertions, 0 deletions
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 @@ void NuCachedSource2::onFetch() {
mFetching = false;
}
} else {
+ Mutex::Autolock autoLock(mLock);
restartPrefetcherIfNecessary_l();
}