diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-02 14:51:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 14:51:37 +0000 |
| commit | 47c888a9fb74f8a46fbf666f0611fd1a9491466f (patch) | |
| tree | ea7631cdcd94ec77ac39be13ed601cce6da89504 /media/libmedia/IAudioTrack.cpp | |
| parent | f38e190887e73bc08735af95b073ebfaabd65f95 (diff) | |
| parent | e580aa4a756d1825c440a4b4309022b1babb6de1 (diff) | |
| download | frameworks_av-47c888a9fb74f8a46fbf666f0611fd1a9491466f.zip frameworks_av-47c888a9fb74f8a46fbf666f0611fd1a9491466f.tar.gz frameworks_av-47c888a9fb74f8a46fbf666f0611fd1a9491466f.tar.bz2 | |
am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"
* commit 'e580aa4a756d1825c440a4b4309022b1babb6de1':
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()); |