summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2014-04-15 20:52:27 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-04-15 20:52:27 +0000
commitc3911c6fa66ed0a41df1e29137ef1a076f9b11b0 (patch)
tree204bcdae4acc2e665b5ceeffcc3b0d5b3d1c627d
parent7f605bd4c09e2b086e69751491e25e98f4a0eb98 (diff)
parentb8ceeb8f6cc3eea53d4b471747c401b9ae54d931 (diff)
am b8ceeb8f: am 85085cd6: Merge "libui: fix passing Fence object over binder"
* commit 'b8ceeb8f6cc3eea53d4b471747c401b9ae54d931': libui: fix passing Fence object over binder
-rw-r--r--libs/ui/Fence.cpp4
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) {