From bfa5e659e7b4cb49178d0e99712478b29f8301a7 Mon Sep 17 00:00:00 2001
From: Miao Wang <miaowang@google.com>
Date: Mon, 4 May 2015 15:29:25 -0700
Subject: [PATCH] [RenderScript] fix Allocation.copyToFieldPacker

Change-Id: Iaba3333f9741238745fdb5c94f1b27b1015d50b2
---
 rs/java/android/renderscript/Allocation.java | 2 +-
 rs/jni/android_renderscript_RenderScript.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 4fa2c81fec605..2ce11a2b33276 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -1448,7 +1448,7 @@ public class Allocation extends BaseObj {
         }
 
         final byte[] data = fp.getData();
-        int data_length = fp.getPos();
+        int data_length = data.length;
         int eSize = mType.mElement.mElements[component_number].getBytesSize();
         eSize *= mType.mElement.mArraySizes[component_number];
 
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index 9684b355bff12..95a1da4575839 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -1465,7 +1465,7 @@ nAllocationElementRead(JNIEnv *_env, jobject _this, jlong con, jlong alloc,
     rsAllocationElementRead((RsContext)con, (RsAllocation)alloc,
                             xoff, yoff, zoff,
                             lod, ptr, sizeBytes, compIdx);
-    _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT);
+    _env->ReleaseByteArrayElements(data, ptr, 0);
 }
 
 // Copies from the Allocation pointed to by _alloc into the Java object data.