diff options
| author | James Dong <jdong@google.com> | 2011-05-25 14:57:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-25 14:57:45 -0700 |
| commit | c004a0c925ea2c9c48bbf9670d2ebf96f432c90a (patch) | |
| tree | 789b3a40ae47c6718a1ac9f572c1240945b30211 /media | |
| parent | a1a56bd0e3d730edab327495acd5d90b10a6f1e4 (diff) | |
| parent | 05e13b9edd3ef6edb286ddc2d92bebecf6666bf8 (diff) | |
| download | frameworks_base-c004a0c925ea2c9c48bbf9670d2ebf96f432c90a.zip frameworks_base-c004a0c925ea2c9c48bbf9670d2ebf96f432c90a.tar.gz frameworks_base-c004a0c925ea2c9c48bbf9670d2ebf96f432c90a.tar.bz2 | |
am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
* commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8':
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 dd29c84..62fb732 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -383,13 +383,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; |