diff options
| author | Colin Cross <ccross@android.com> | 2014-04-15 02:10:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-15 02:10:51 +0000 |
| commit | 85085cd6dd5ffed556e0a044ccf4080fbe7c5981 (patch) | |
| tree | a8a0199fdc1898f85ab265d7a80ea757af7e9c35 | |
| parent | 82fb58095524c833b0470c4b236aa8a70acf2a0f (diff) | |
| parent | 288f2ef6294b99a4a53355273ae8ad0f5a525f65 (diff) | |
| download | native-85085cd6dd5ffed556e0a044ccf4080fbe7c5981.tar.gz | |
Merge "libui: fix passing Fence object over binder"
| -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) { |