Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1

Browse Source 
* commit '837430dd3440f6e71f68ef755399e22386dee084':
  Switch to use SF cached source
This commit is contained in:
James Dong
2011-03-25 10:24:44 -07:00
committed by Android Git Automerger
parent aac43ea193 837430dd34
commit 9fb98238e5
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/AwesomePlayer.cpp
View File

@@ -1734,12 +1734,7 @@ status_t AwesomePlayer::finishSetDataSource_l() {
dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient); dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient);
if (mDecryptHandle != NULL) { if (mDecryptHandle != NULL) {
CHECK(mDrmManagerClient); CHECK(mDrmManagerClient);
if (RightsStatus::RIGHTS_VALID == mDecryptHandle->status) { if (RightsStatus::RIGHTS_VALID != mDecryptHandle->status) {
if (DecryptApiType::WV_BASED == mDecryptHandle->decryptApiType) {
LOGD("Setting mCachedSource to NULL for WVM\n");
mCachedSource.clear();
}
} else {
notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE);
} }
} }