diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-10 13:39:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 13:39:39 +0000 |
| commit | 33a608a0a326d9671bffd6750cb5521d6687cc57 (patch) | |
| tree | a061290e5f78571bed2021792f9bbd7fec18bfb6 /rs/java/android/renderscript/BaseObj.java | |
| parent | ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3 (diff) | |
| parent | 578d4f5f50b3b8969125376d696e893dc355faa6 (diff) | |
| download | frameworks_base-33a608a0a326d9671bffd6750cb5521d6687cc57.zip frameworks_base-33a608a0a326d9671bffd6750cb5521d6687cc57.tar.gz frameworks_base-33a608a0a326d9671bffd6750cb5521d6687cc57.tar.bz2 | |
am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '578d4f5f50b3b8969125376d696e893dc355faa6':
AArch64: Use long for pointers in RS Java/JNI code
Diffstat (limited to 'rs/java/android/renderscript/BaseObj.java')
| -rw-r--r-- | rs/java/android/renderscript/BaseObj.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/BaseObj.java b/rs/java/android/renderscript/BaseObj.java index eee4936..842aa23 100644 --- a/rs/java/android/renderscript/BaseObj.java +++ b/rs/java/android/renderscript/BaseObj.java @@ -32,7 +32,7 @@ public class BaseObj { mDestroyed = false; } - void setID(int id) { + void setID(long id) { if (mID != 0) { throw new RSRuntimeException("Internal Error, reset of object ID."); } |