diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-02 08:03:58 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-05-02 08:03:58 -0700 |
| commit | b53fc4ef8da47df8d5f580e8ee6135866ffebc33 (patch) | |
| tree | e0ae90826c9f015c3f4f48faddf93b94ed84aea6 /media/libmedia/IAudioTrack.cpp | |
| parent | 33ddcb6f1049cb4b6c71bb7ea605375f9492601d (diff) | |
| parent | 47c888a9fb74f8a46fbf666f0611fd1a9491466f (diff) | |
| download | frameworks_av-b53fc4ef8da47df8d5f580e8ee6135866ffebc33.zip frameworks_av-b53fc4ef8da47df8d5f580e8ee6135866ffebc33.tar.gz frameworks_av-b53fc4ef8da47df8d5f580e8ee6135866ffebc33.tar.bz2 | |
resolved conflicts for merge of 47c888a9 to master
Change-Id: I4ba2fdc6374a93a892bb7651b0d174e495f09bf6
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 ffc21fc..265bb1b 100644 --- a/media/libmedia/IAudioTrack.cpp +++ b/media/libmedia/IAudioTrack.cpp @@ -118,7 +118,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) { @@ -238,7 +238,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()); |