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

1 files changed, 1 insertions, 6 deletions

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index bac1334615d8..435a1b06a665 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);
         }
     }