summaryrefslogtreecommitdiffstats
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2014-03-06 00:50:24 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-03-06 00:50:24 +0000
commit2383f2200ab0c2dbd71708b5c1fb6af98db408fa (patch)
tree9ed974600f08f0a1e766436a5c3e9cb39e5a4c22 /rs/java/android/renderscript/RenderScript.java
parentbe7b8f4f4c62239ad20202e4bbe8120d5e3dcf82 (diff)
parent678cc7fe9fef00fb3381e64f95cc6907796bcd8e (diff)
downloadframeworks_base-2383f2200ab0c2dbd71708b5c1fb6af98db408fa.zip
frameworks_base-2383f2200ab0c2dbd71708b5c1fb6af98db408fa.tar.gz
frameworks_base-2383f2200ab0c2dbd71708b5c1fb6af98db408fa.tar.bz2
Merge "Validate objects are from the correct context."
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r--rs/java/android/renderscript/RenderScript.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 7db331f..eebeaa4 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -1004,6 +1004,14 @@ public class RenderScript {
}
}
+ void validateObject(BaseObj o) {
+ if (o != null) {
+ if (o.mRS != this) {
+ throw new RSIllegalArgumentException("Attempting to use an object across contexts.");
+ }
+ }
+ }
+
void validate() {
if (mContext == 0) {
throw new RSInvalidStateException("Calling RS with no Context active.");