Merge "Switch to use SF cached source" into honeycomb-mr1

2011-03-25 10:22:57 -07:00
parent b8b85ea296 3be1593628
commit 837430dd34
1 changed files with 1 additions and 6 deletions
--- 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);
        }
    }