diff options
| author | 2014-04-15 02:17:28 +0000 | |
|---|---|---|
| committer | 2014-04-15 02:17:28 +0000 | |
| commit | b8ceeb8f6cc3eea53d4b471747c401b9ae54d931 (patch) | |
| tree | 4ede6055dec4690b4ea6a297077ade9b3ab7a1b4 /libs/ui/Fence.cpp | |
| parent | ef89f7638c43ce5f73e32d487bf65c3375995e3b (diff) | |
| parent | 85085cd6dd5ffed556e0a044ccf4080fbe7c5981 (diff) | |
am 85085cd6: Merge "libui: fix passing Fence object over binder"
* commit '85085cd6dd5ffed556e0a044ccf4080fbe7c5981':
libui: fix passing Fence object over binder
Diffstat (limited to 'libs/ui/Fence.cpp')
| -rw-r--r-- | libs/ui/Fence.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp index 93ec0ce611..3c0306cf0b 100644 --- a/libs/ui/Fence.cpp +++ b/libs/ui/Fence.cpp @@ -138,7 +138,7 @@ status_t Fence::flatten(void*& buffer, size_t& size, int*& fds, size_t& count) c if (size < getFlattenedSize() || count < getFdCount()) { return NO_MEMORY; } - FlattenableUtils::write(buffer, size, getFdCount()); + FlattenableUtils::write(buffer, size, (uint32_t)getFdCount()); if (isValid()) { *fds++ = mFenceFd; count--; @@ -156,7 +156,7 @@ status_t Fence::unflatten(void const*& buffer, size_t& size, int const*& fds, si return NO_MEMORY; } - size_t numFds; + uint32_t numFds; FlattenableUtils::read(buffer, size, numFds); if (numFds > 1) { |