summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/DrmManagerClientImpl.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/DrmManagerClientImpl.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/DrmManagerClientImpl.cpp')
-rw-r--r--drm/libdrmframework/DrmManagerClientImpl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/drm/libdrmframework/DrmManagerClientImpl.cpp b/drm/libdrmframework/DrmManagerClientImpl.cpp
index b3ae9a7..519ed67 100644
--- a/drm/libdrmframework/DrmManagerClientImpl.cpp
+++ b/drm/libdrmframework/DrmManagerClientImpl.cpp
@@ -170,7 +170,7 @@ status_t DrmManagerClientImpl::consumeRights(
}
status_t DrmManagerClientImpl::setPlaybackStatus(
- int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int position) {
+ int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position) {
status_t status = DRM_ERROR_UNKNOWN;
if (NULL != decryptHandle) {
status = getDrmManagerService()->setPlaybackStatus(
@@ -231,7 +231,7 @@ status_t DrmManagerClientImpl::getAllSupportInfo(
}
DecryptHandle* DrmManagerClientImpl::openDecryptSession(
- int uniqueId, int fd, int offset, int length) {
+ int uniqueId, int fd, off64_t offset, off64_t length) {
return getDrmManagerService()->openDecryptSession(uniqueId, fd, offset, length);
}
@@ -283,7 +283,7 @@ status_t DrmManagerClientImpl::finalizeDecryptUnit(
}
ssize_t DrmManagerClientImpl::pread(int uniqueId, DecryptHandle* decryptHandle,
- void* buffer, ssize_t numBytes, off_t offset) {
+ void* buffer, ssize_t numBytes, off64_t offset) {
ssize_t retCode = INVALID_VALUE;
if ((NULL != decryptHandle) && (NULL != buffer) && (0 < numBytes)) {
retCode = getDrmManagerService()->pread(uniqueId, decryptHandle, buffer, numBytes, offset);