diff options
| author | James Dong <jdong@google.com> | 2011-03-25 10:24:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-25 10:24:44 -0700 |
| commit | 9fb98238e5837a68fb16bcb9a23469f27124c304 (patch) | |
| tree | 567812870c4094fa2f4f21ab19c8898af9a51e14 /media | |
| parent | aac43ea193e0cbd440854f3425579f9ff04abac3 (diff) | |
| parent | 837430dd3440f6e71f68ef755399e22386dee084 (diff) | |
| download | frameworks_base-9fb98238e5837a68fb16bcb9a23469f27124c304.zip frameworks_base-9fb98238e5837a68fb16bcb9a23469f27124c304.tar.gz frameworks_base-9fb98238e5837a68fb16bcb9a23469f27124c304.tar.bz2 | |
am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
* commit '837430dd3440f6e71f68ef755399e22386dee084':
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 bac1334..435a1b0 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1734,12 +1734,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient); 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); } } |