diff options
| author | James Dong <jdong@google.com> | 2011-03-25 10:29:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-25 10:29:20 -0700 |
| commit | f490e1765c44f63bde8e8acd905f36f92a840ddf (patch) | |
| tree | ec0b106c9022987aeeccf53a4319746ae3492bfe /media | |
| parent | 277360f06bdfefe821d4ddde8876f8e2507887c3 (diff) | |
| parent | df4a70cf8858185323e5176bd3bed51f1b5cbc35 (diff) | |
| download | frameworks_av-f490e1765c44f63bde8e8acd905f36f92a840ddf.zip frameworks_av-f490e1765c44f63bde8e8acd905f36f92a840ddf.tar.gz frameworks_av-f490e1765c44f63bde8e8acd905f36f92a840ddf.tar.bz2 | |
am 70a5b031: am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
* commit '70a5b0317d5029b34be26a423c0ebeaa74b728ed':
Switch to use SF cached source
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index b893695..c9a0b60 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1747,12 +1747,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { if (mDecryptHandle != NULL) { CHECK(mDrmManagerClient); - if (RightsStatus::RIGHTS_VALID == mDecryptHandle->status) { - if (DecryptApiType::WV_BASED == mDecryptHandle->decryptApiType) { - LOGD("Setting mCachedSource to NULL for WVM\n"); - mCachedSource.clear(); - } - } else { + if (RightsStatus::RIGHTS_VALID != mDecryptHandle->status) { notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); } } |