diff options
| author | James Dong <jdong@google.com> | 2011-05-26 11:41:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 11:41:30 -0700 |
| commit | 0be123918ed9711214b0f2e3106fdb7de0bcff13 (patch) | |
| tree | d72768ef4ca082a8056993b82c9312a839fcc09f /media | |
| parent | 93e179bbe7da2edd8c44078cfb39ad515e23e8e6 (diff) | |
| parent | c004a0c925ea2c9c48bbf9670d2ebf96f432c90a (diff) | |
| download | frameworks_base-0be123918ed9711214b0f2e3106fdb7de0bcff13.zip frameworks_base-0be123918ed9711214b0f2e3106fdb7de0bcff13.tar.gz frameworks_base-0be123918ed9711214b0f2e3106fdb7de0bcff13.tar.bz2 | |
am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
Revert "Use pread() to get the decrypted data for container based DRM file."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/NuHTTPDataSource.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp index ce30fc8..821ba9b 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -392,13 +392,6 @@ ssize_t NuHTTPDataSource::readAt(off64_t offset, void *data, size_t size) { Mutex::Autolock autoLock(mLock); - // if it's a DRM container based streaming, call pread() of the DRM plugin - // to get the decrypted data - if (mDecryptHandle != NULL && DecryptApiType::CONTAINER_BASED - == mDecryptHandle->decryptApiType) { - return mDrmManagerClient->pread(mDecryptHandle, data, size, offset); - } - if (offset != mOffset) { String8 host = mHost; String8 path = mPath; |