diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-10 05:37:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 05:37:18 -0800 |
| commit | 578d4f5f50b3b8969125376d696e893dc355faa6 (patch) | |
| tree | 0fd47306e17d1df57118a6df657b656c6f56155a /rs/java/android/renderscript/BaseObj.java | |
| parent | 379bb6ed4ea4de035569b04018f84d7ce95a8036 (diff) | |
| parent | 56062983f1e07295c812fba0e22ce579a35b6f76 (diff) | |
| download | frameworks_base-578d4f5f50b3b8969125376d696e893dc355faa6.zip frameworks_base-578d4f5f50b3b8969125376d696e893dc355faa6.tar.gz frameworks_base-578d4f5f50b3b8969125376d696e893dc355faa6.tar.bz2 | |
am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
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."); } |