diff options
author | Glenn Kasten <gkasten@google.com> | 2014-05-02 14:48:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 14:48:27 +0000 |
commit | e580aa4a756d1825c440a4b4309022b1babb6de1 (patch) | |
tree | 689e1e7dbd0748d317f8363af7f37090929e9664 /media/libmedia/IAudioTrack.cpp | |
parent | 3d9164da1b3d58701e41c78e06839d61ed1b4ff9 (diff) | |
parent | 86438382a381eb39ed8da53fbd16cf6730fded6c (diff) | |
download | frameworks_av-e580aa4a756d1825c440a4b4309022b1babb6de1.zip frameworks_av-e580aa4a756d1825c440a4b4309022b1babb6de1.tar.gz frameworks_av-e580aa4a756d1825c440a4b4309022b1babb6de1.tar.bz2 |
am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"
* commit '86438382a381eb39ed8da53fbd16cf6730fded6c':
When passing a size_t via binder, use 64-bits unconditionally
Diffstat (limited to 'media/libmedia/IAudioTrack.cpp')
-rw-r--r-- | media/libmedia/IAudioTrack.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/IAudioTrack.cpp b/media/libmedia/IAudioTrack.cpp index 3cd9cfd..e9df704 100644 --- a/media/libmedia/IAudioTrack.cpp +++ b/media/libmedia/IAudioTrack.cpp @@ -115,7 +115,7 @@ public: virtual status_t allocateTimedBuffer(size_t size, sp<IMemory>* buffer) { Parcel data, reply; data.writeInterfaceToken(IAudioTrack::getInterfaceDescriptor()); - data.writeInt32(size); + data.writeInt64(size); status_t status = remote()->transact(ALLOCATE_TIMED_BUFFER, data, &reply); if (status == NO_ERROR) { @@ -232,7 +232,7 @@ status_t BnAudioTrack::onTransact( case ALLOCATE_TIMED_BUFFER: { CHECK_INTERFACE(IAudioTrack, data, reply); sp<IMemory> buffer; - status_t status = allocateTimedBuffer(data.readInt32(), &buffer); + status_t status = allocateTimedBuffer(data.readInt64(), &buffer); reply->writeInt32(status); if (status == NO_ERROR) { reply->writeStrongBinder(buffer->asBinder()); |