diff options
| author | James Dong <jdong@google.com> | 2011-03-25 10:22:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-25 10:22:57 -0700 |
| commit | 837430dd3440f6e71f68ef755399e22386dee084 (patch) | |
| tree | ed9a96fb370acb9633902a04ffe3a0e7cf5f7200 | |
| parent | b8b85ea296b09cfc5f986e8ee38b959776050d43 (diff) | |
| parent | 3be159362891c810b24f2ebbc4b097b316ffb05c (diff) | |
| download | frameworks_base-837430dd3440f6e71f68ef755399e22386dee084.zip frameworks_base-837430dd3440f6e71f68ef755399e22386dee084.tar.gz frameworks_base-837430dd3440f6e71f68ef755399e22386dee084.tar.bz2 | |
Merge "Switch to use SF cached source" into honeycomb-mr1
| -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); } } |