ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am b8ceeb8f: am 85085cd6: Merge "libui: fix passing Fence object over binder" 

* commit 'b8ceeb8f6cc3eea53d4b471747c401b9ae54d931':
  libui: fix passing Fence object over binder
This commit is contained in:
Colin Cross 2014-04-15 20:52:27 +00:00 committed by Android Git Automerger
parent 7f605bd4c0 b8ceeb8f6c
commit c3911c6fa6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ui/Fence.cpp
View File

@ -138,7 +138,7 @@ status_t Fence::flatten(void*& buffer, size_t& size, int*& fds, size_t& count) c
if (size < getFlattenedSize() || count < getFdCount()) { if (size < getFlattenedSize() || count < getFdCount()) {
return NO_MEMORY; return NO_MEMORY;
} }
FlattenableUtils::write(buffer, size, getFdCount()); FlattenableUtils::write(buffer, size, (uint32_t)getFdCount());
if (isValid()) { if (isValid()) {
*fds++ = mFenceFd; *fds++ = mFenceFd;
count--; count--;
@ -156,7 +156,7 @@ status_t Fence::unflatten(void const*& buffer, size_t& size, int const*& fds, si
return NO_MEMORY; return NO_MEMORY;
} }
size_t numFds; uint32_t numFds;
FlattenableUtils::read(buffer, size, numFds); FlattenableUtils::read(buffer, size, numFds);
if (numFds > 1) { if (numFds > 1) {