diff options
| author | Tim Murray <timmurray@google.com> | 2013-11-20 22:46:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-20 22:46:47 +0000 |
| commit | 84379677339b4a7a78be377e1c96d0da966e49cf (patch) | |
| tree | 78b9aaa2b0da7120ce90ab25601ea5cd013d4522 /graphics/java/android/renderscript/BaseObj.java | |
| parent | 52909212a6e5cc9f7d6bfff0d9a8440a2881fdb0 (diff) | |
| parent | 460a04971c494fec39ffcb38e873bb8fdd82d113 (diff) | |
Merge "Convert Java/JNI to 64-bit, part 2."
Diffstat (limited to 'graphics/java/android/renderscript/BaseObj.java')
| -rw-r--r-- | graphics/java/android/renderscript/BaseObj.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java index 60c012a9ea0a..1a15ce6f2fa4 100644 --- a/graphics/java/android/renderscript/BaseObj.java +++ b/graphics/java/android/renderscript/BaseObj.java @@ -23,7 +23,7 @@ package android.renderscript; * **/ public class BaseObj { - BaseObj(int id, RenderScript rs) { + BaseObj(long id, RenderScript rs) { rs.validate(); mRS = rs; mID = id; @@ -44,9 +44,9 @@ public class BaseObj { * @param rs Context to verify against internal context for * match. * - * @return int + * @return long */ - int getID(RenderScript rs) { + long getID(RenderScript rs) { mRS.validate(); if (mDestroyed) { throw new RSInvalidStateException("using a destroyed object."); @@ -66,7 +66,7 @@ public class BaseObj { } } - private int mID; + private long mID; private boolean mDestroyed; private String mName; RenderScript mRS; @@ -150,7 +150,7 @@ public class BaseObj { */ @Override public int hashCode() { - return mID; + return (int)((mID & 0xfffffff) ^ (mID >> 32)); } /** |