summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/AllocationAdapter.java
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-11-20 22:46:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-20 22:46:47 +0000
commit84379677339b4a7a78be377e1c96d0da966e49cf (patch)
tree78b9aaa2b0da7120ce90ab25601ea5cd013d4522 /graphics/java/android/renderscript/AllocationAdapter.java
parent52909212a6e5cc9f7d6bfff0d9a8440a2881fdb0 (diff)
parent460a04971c494fec39ffcb38e873bb8fdd82d113 (diff)
Merge "Convert Java/JNI to 64-bit, part 2."
Diffstat (limited to 'graphics/java/android/renderscript/AllocationAdapter.java')
-rw-r--r--graphics/java/android/renderscript/AllocationAdapter.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/AllocationAdapter.java b/graphics/java/android/renderscript/AllocationAdapter.java
index 35aaf7a080f0..6c1b1ed6cc11 100644
--- a/graphics/java/android/renderscript/AllocationAdapter.java
+++ b/graphics/java/android/renderscript/AllocationAdapter.java
@@ -21,12 +21,12 @@ package android.renderscript;
*
**/
public class AllocationAdapter extends Allocation {
- AllocationAdapter(int id, RenderScript rs, Allocation alloc) {
+ AllocationAdapter(long id, RenderScript rs, Allocation alloc) {
super(id, rs, alloc.mType, alloc.mUsage);
mAdaptedAllocation = alloc;
}
- int getID(RenderScript rs) {
+ long getID(RenderScript rs) {
throw new RSInvalidStateException(
"This operation is not supported with adapters at this time.");
}