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

This commit is contained in:
James Dong
2011-05-25 14:51:52 -07:00
committed by Android (Google) Code Review

View File

@@ -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;