commit 9b732dec07b506acd4a78c3377c4c003c4b4d857
author Andreas Huber <andih@google.com> Tue Mar 23 15:30:57 2010 -0700
committer Andreas Huber <andih@google.com> Tue Mar 23 15:30:57 2010 -0700
tree 6ef63cf101bb2276598b47b6738537873b966fe3
parent e5efe212de241dedcc5c4e409a4bf0376bc28be3

Clear the local prefetcher strong reference before signalling that prepare() was cancelled early in order to avoid a race condition that occasionally triggered an assertion from the main thread.

Change-Id: I0db198fe5fd0fbe9a6c90a8e5924a2df05432c4c
related-to-bug: 2538486

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 164df72..407fd57 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1153,6 +1153,8 @@
             Mutex::Autolock autoLock(mLock);
             if (mFlags & PREPARE_CANCELLED) {
                 LOGI("prepare was cancelled before preparing the prefetcher");
+
+                prefetcher.clear();
                 abortPrepare(UNKNOWN_ERROR);
                 return;
             }