commit eb2b52ffaff549df07fbf848d1475a207d33038d
author Tim Murray <timmurray@google.com> Thu Jun 12 23:13:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 12 23:13:28 2014 +0000
tree 03d48c26f74d9e1600a0bd1465da67b8faf4d64c
parent a6ce7708d6124224399241503fadcafe0c4684d4
parent 604ea0e415faa2466ab6c89372001d6c93ad0d98

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

* commit '604ea0e415faa2466ab6c89372001d6c93ad0d98':
  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 0e57232..c9bba69 100644
--- a/rs/java/android/renderscript/FieldPacker.java
+++ b/rs/java/android/renderscript/FieldPacker.java
@@ -233,6 +233,9 @@
         if (obj != null) {
             if (RenderScript.sPointerSize == 8) {
                 addI64(obj.getID(null));
+                addI64(0);
+                addI64(0);
+                addI64(0);
             }
             else {
                 addI32((int)obj.getID(null));
@@ -240,6 +243,9 @@
         } else {
             if (RenderScript.sPointerSize == 8) {
                 addI64(0);
+                addI64(0);
+                addI64(0);
+                addI64(0);
             } else {
                 addI32(0);
             }