am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."

* commit '9a9916b58fb22da735d18a03beffb24b4d5cd9a3':
  Validate objects are from the correct context.

1 files changed, 8 insertions, 0 deletions

diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 7db331f0ab0c..eebeaa4ff8cc 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.");