Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

Browse Source 
* commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8':
  Revert "Use pread() to get the decrypted data for container based DRM file."
This commit is contained in:
James Dong
2011-05-25 14:57:45 -07:00
committed by Android Git Automerger
parent a1a56bd0e3 05e13b9edd
commit c004a0c925
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/NuHTTPDataSource.cpp
View File

@@ -383,13 +383,6 @@ ssize_t NuHTTPDataSource::readAt(off64_t offset, void *data, size_t size) {
Mutex::Autolock autoLock(mLock); 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) { if (offset != mOffset) {
String8 host = mHost; String8 host = mHost;
String8 path = mPath; String8 path = mPath;