diff options
| author | James Dong <jdong@google.com> | 2012-06-13 17:01:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-13 17:01:22 -0700 |
| commit | 8fe9840be2ce6aac8a008fc15cb641f858b5a32e (patch) | |
| tree | 6b92f2c30766f11079bc8de4d4e24611216b6827 | |
| parent | 02bd296991e7e8a17939419cf197a6747ea441de (diff) | |
| parent | cac467b3af9235229522a134d2c57e4fa605ba2f (diff) | |
| download | frameworks_av-8fe9840be2ce6aac8a008fc15cb641f858b5a32e.zip frameworks_av-8fe9840be2ce6aac8a008fc15cb641f858b5a32e.tar.gz frameworks_av-8fe9840be2ce6aac8a008fc15cb641f858b5a32e.tar.bz2 | |
am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev
* commit 'cac467b3af9235229522a134d2c57e4fa605ba2f':
Fix one of the potential ANR issues from AwesomePlayer
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 0749254..d7f721f 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -2120,7 +2120,13 @@ status_t AwesomePlayer::finishSetDataSource_l() { String8 mimeType; float confidence; sp<AMessage> dummy; - bool success = SniffWVM(dataSource, &mimeType, &confidence, &dummy); + bool success; + + // SniffWVM is potentially blocking since it may require network access. + // Do not call it with mLock held. + mLock.unlock(); + success = SniffWVM(dataSource, &mimeType, &confidence, &dummy); + mLock.lock(); if (!success || strcasecmp( |