diff options
| author | Gloria Wang <gwang@google.com> | 2011-01-19 16:01:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-19 16:01:34 -0800 |
| commit | e21495572bebb9c7b5fad745ca1516e53e8fd395 (patch) | |
| tree | 405625778609c9d65ff20fb3571227867100f16f /drm | |
| parent | 62c64c48f8ae8142b893b20cf08fab2cb2a1d69f (diff) | |
| parent | 5cc52d46226bf1ab6faa8910413153c0b86dc5c9 (diff) | |
| download | frameworks_av-e21495572bebb9c7b5fad745ca1516e53e8fd395.zip frameworks_av-e21495572bebb9c7b5fad745ca1516e53e8fd395.tar.gz frameworks_av-e21495572bebb9c7b5fad745ca1516e53e8fd395.tar.bz2 | |
am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
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; |