diff options
| author | Andreas Huber <andih@google.com> | 2010-06-11 16:01:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 16:01:34 -0700 |
| commit | f49a97b33b325426cd319f0dc960024ff68cce82 (patch) | |
| tree | 9cc9797ab2473bc53946486b8c56462d0ed5cfe1 /media | |
| parent | 2f8aeb406368995ba760937b3c3465ea7b562fa2 (diff) | |
| parent | a1ad27130107b4377cc94b310a1e6c51d4b17cde (diff) | |
| download | frameworks_av-f49a97b33b325426cd319f0dc960024ff68cce82.zip frameworks_av-f49a97b33b325426cd319f0dc960024ff68cce82.tar.gz frameworks_av-f49a97b33b325426cd319f0dc960024ff68cce82.tar.bz2 | |
am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'
* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
Must hold lock here...
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/NuCachedSource2.cpp | 1 |
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(); } |