diff options
author | Gloria Wang <gwang@google.com> | 2011-01-19 15:59:13 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-19 15:59:13 -0800 |
commit | 5cc52d46226bf1ab6faa8910413153c0b86dc5c9 (patch) | |
tree | 8f369f30d2ff5d39db2ceaca042f0bf917cb6df9 /drm | |
parent | f16e4df61fb5482adffa1a541de985c48506ff28 (diff) | |
parent | 91a685f1eaa32cadb461755fb235239b308953c9 (diff) | |
download | frameworks_av-5cc52d46226bf1ab6faa8910413153c0b86dc5c9.zip frameworks_av-5cc52d46226bf1ab6faa8910413153c0b86dc5c9.tar.gz frameworks_av-5cc52d46226bf1ab6faa8910413153c0b86dc5c9.tar.bz2 |
am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7':
More fix for 64 bit offset.
Diffstat (limited to 'drm')
-rw-r--r-- | drm/common/IDrmManagerService.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp index 75edac6..ddbd220 100644 --- a/drm/common/IDrmManagerService.cpp +++ b/drm/common/IDrmManagerService.cpp @@ -382,7 +382,7 @@ status_t BpDrmManagerService::setPlaybackStatus( } data.writeInt32(playbackStatus); - data.writeInt32(position); + data.writeInt64(position); remote()->transact(SET_PLAYBACK_STATUS, data, &reply); return reply.readInt32(); @@ -1111,7 +1111,7 @@ status_t BnDrmManagerService::onTransact( } const status_t status - = setPlaybackStatus(uniqueId, &handle, data.readInt32(), data.readInt32()); + = setPlaybackStatus(uniqueId, &handle, data.readInt32(), data.readInt64()); reply->writeInt32(status); delete handle.decryptInfo; handle.decryptInfo = NULL; |