diff options
author | Glenn Kasten <gkasten@google.com> | 2014-01-28 11:04:39 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@android.com> | 2014-02-13 09:46:19 -0800 |
commit | e03dd22716e688faa56467561827d9b1ea0c4214 (patch) | |
tree | 22ad88aaeec5fe2c061aa495aaff9f7e34ec8c6b /media/libmedia/IMediaMetadataRetriever.cpp | |
parent | af191eb4feac513d17dc0362e0cea5bc9e0ffe9d (diff) | |
download | frameworks_av-e03dd22716e688faa56467561827d9b1ea0c4214.zip frameworks_av-e03dd22716e688faa56467561827d9b1ea0c4214.tar.gz frameworks_av-e03dd22716e688faa56467561827d9b1ea0c4214.tar.bz2 |
When passing a size_t via binder, use 64-bits unconditionally
64-bits is almost always over-kill. But it's easier and cleaner to change
the binder code to be accurate, than to rename all the the API parameter
types to be 32-bit.
Bug: 12381724
Change-Id: Ib8f198d814a2027760ef24e9e3feacee21a973b1
Diffstat (limited to 'media/libmedia/IMediaMetadataRetriever.cpp')
-rw-r--r-- | media/libmedia/IMediaMetadataRetriever.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/IMediaMetadataRetriever.cpp b/media/libmedia/IMediaMetadataRetriever.cpp index bb066a0..a91ad49 100644 --- a/media/libmedia/IMediaMetadataRetriever.cpp +++ b/media/libmedia/IMediaMetadataRetriever.cpp @@ -94,7 +94,7 @@ public: data.writeInt32(0); } else { // serialize the headers - data.writeInt32(headers->size()); + data.writeInt64(headers->size()); for (size_t i = 0; i < headers->size(); ++i) { data.writeString8(headers->keyAt(i)); data.writeString8(headers->valueAt(i)); @@ -198,8 +198,8 @@ status_t BnMediaMetadataRetriever::onTransact( const char* srcUrl = data.readCString(); KeyedVector<String8, String8> headers; - int32_t numHeaders = data.readInt32(); - for (int i = 0; i < numHeaders; ++i) { + size_t numHeaders = (size_t) data.readInt64(); + for (size_t i = 0; i < numHeaders; ++i) { String8 key = data.readString8(); String8 value = data.readString8(); headers.add(key, value); |