commit c3911c6fa66ed0a41df1e29137ef1a076f9b11b0
author Colin Cross <ccross@android.com> Tue Apr 15 20:52:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 15 20:52:27 2014 +0000
tree 204bcdae4acc2e665b5ceeffcc3b0d5b3d1c627d
parent 7f605bd4c09e2b086e69751491e25e98f4a0eb98
parent b8ceeb8f6cc3eea53d4b471747c401b9ae54d931

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

* commit 'b8ceeb8f6cc3eea53d4b471747c401b9ae54d931':
  libui: fix passing Fence object over binder

libs/ui/Fence.cpp

diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
index 93ec0ce..3c0306c 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -138,7 +138,7 @@
     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 @@
         return NO_MEMORY;
     }
 
-    size_t numFds;
+    uint32_t numFds;
     FlattenableUtils::read(buffer, size, numFds);
 
     if (numFds > 1) {