summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/DrmManagerClient.cpp
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-11-22 10:48:30 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-22 10:48:30 -0800
commit83d97c8c7ddff9374f876bef48758414a7775cb1 (patch)
tree8c34611cbbd6c2e84c886ed86d8bed154f39fc33 /drm/libdrmframework/DrmManagerClient.cpp
parent18439bee6f8b525abe3f1fac69bc4cea184e1565 (diff)
parent5fc3edb13edb058f14e6550d295ce3e50e5ebf8c (diff)
downloadframeworks_base-83d97c8c7ddff9374f876bef48758414a7775cb1.zip
frameworks_base-83d97c8c7ddff9374f876bef48758414a7775cb1.tar.gz
frameworks_base-83d97c8c7ddff9374f876bef48758414a7775cb1.tar.bz2
Merge "64-bit file size/offset support for DRM framework"
Diffstat (limited to 'drm/libdrmframework/DrmManagerClient.cpp')
-rw-r--r--drm/libdrmframework/DrmManagerClient.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/drm/libdrmframework/DrmManagerClient.cpp b/drm/libdrmframework/DrmManagerClient.cpp
index f0439eb..0cbbbd4 100644
--- a/drm/libdrmframework/DrmManagerClient.cpp
+++ b/drm/libdrmframework/DrmManagerClient.cpp
@@ -78,7 +78,7 @@ status_t DrmManagerClient::consumeRights(DecryptHandle* decryptHandle, int actio
}
status_t DrmManagerClient::setPlaybackStatus(
- DecryptHandle* decryptHandle, int playbackStatus, int position) {
+ DecryptHandle* decryptHandle, int playbackStatus, int64_t position) {
return mDrmManagerClientImpl
->setPlaybackStatus(mUniqueId, decryptHandle, playbackStatus, position);
}
@@ -112,7 +112,7 @@ status_t DrmManagerClient::getAllSupportInfo(int* length, DrmSupportInfo** drmSu
return mDrmManagerClientImpl->getAllSupportInfo(mUniqueId, length, drmSupportInfoArray);
}
-DecryptHandle* DrmManagerClient::openDecryptSession(int fd, int offset, int length) {
+DecryptHandle* DrmManagerClient::openDecryptSession(int fd, off64_t offset, off64_t length) {
return mDrmManagerClientImpl->openDecryptSession(mUniqueId, fd, offset, length);
}
@@ -145,7 +145,7 @@ status_t DrmManagerClient::finalizeDecryptUnit(DecryptHandle* decryptHandle, int
}
ssize_t DrmManagerClient::pread(
- DecryptHandle* decryptHandle, void* buffer, ssize_t numBytes, off_t offset) {
+ DecryptHandle* decryptHandle, void* buffer, ssize_t numBytes, off64_t offset) {
Mutex::Autolock _l(mDecryptLock);
return mDrmManagerClientImpl->pread(mUniqueId, decryptHandle, buffer, numBytes, offset);
}