commit b5d6ec7cff06e6cbeeb238bea535c54a67e94d49
author Chad Brubaker <cbrubaker@google.com> Tue Jun 30 22:59:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 30 22:59:12 2015 +0000
tree ee7b335cb398cb31f8d383d5e87349a24412a920
parent 6a25a2872852f23058268adcec61600460fcdfb6
parent e59cb43edad0eff28a81b18c3c4484442ff680dd

am e59cb43e: Fix writeByteArray/writeInt32Array size on x64

* commit 'e59cb43edad0eff28a81b18c3c4484442ff680dd':
  Fix writeByteArray/writeInt32Array size on x64

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 31667d9..7a4ddc4 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -735,9 +735,9 @@
     }
 
     if (!val) {
-        return writeAligned(-1);
+        return writeInt32(-1);
     }
-    status_t ret = writeAligned(len);
+    status_t ret = writeInt32(static_cast<uint32_t>(len));
     if (ret == NO_ERROR) {
         ret = write(val, len * sizeof(*val));
     }
@@ -751,9 +751,9 @@
     }
 
     if (!val) {
-        return writeAligned(-1);
+        return writeInt32(-1);
     }
-    status_t ret = writeAligned(len);
+    status_t ret = writeInt32(static_cast<uint32_t>(len));
     if (ret == NO_ERROR) {
         ret = write(val, len * sizeof(*val));
     }