commit b1c9430c8749b1feba59bb55a31cb1364270981b
author Tim Murray <timmurray@google.com> Thu Jun 12 23:05:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 12 23:05:16 2014 +0000
tree adaa1deae37cc88bc34a182e9eeb7b367ba59581
parent 9a0485aa567c99157e45d08e9712a281f34ffc5f
parent 77d28ca25378530f92d409fbd72a38a1e256b59f

am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."

* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
  Move FieldPacker over to use large objects on 64-bit.

rs/java/android/renderscript/FieldPacker.java

diff --git a/rs/java/android/renderscript/FieldPacker.java b/rs/java/android/renderscript/FieldPacker.java
index 2ff1c28..576a84d 100644
--- a/rs/java/android/renderscript/FieldPacker.java
+++ b/rs/java/android/renderscript/FieldPacker.java
@@ -234,6 +234,9 @@
         if (obj != null) {
             if (RenderScript.sPointerSize == 8) {
                 addI64(obj.getID(null));
+                addI64(0);
+                addI64(0);
+                addI64(0);
             }
             else {
                 addI32((int)obj.getID(null));
@@ -241,6 +244,9 @@
         } else {
             if (RenderScript.sPointerSize == 8) {
                 addI64(0);
+                addI64(0);
+                addI64(0);
+                addI64(0);
             } else {
                 addI32(0);
             }