commit f4aa99aa562d8217421b5e91e615edd9b7006604
author James Dong <jdong@google.com> Fri Mar 25 10:29:20 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 25 10:29:20 2011 -0700
tree 15f946da311dfe5fd21269ade06f782715ce0951
parent 503b111b2421673796500627a1f6d74d81bf9548
parent 70a5b0317d5029b34be26a423c0ebeaa74b728ed

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

* commit '70a5b0317d5029b34be26a423c0ebeaa74b728ed':
  Switch to use SF cached source

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index b893695..c9a0b60 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1747,12 +1747,7 @@
 
     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);
         }
     }