commit 3385b6169f47fd663d893fc787173c2d57a0a05f
author Stephen Hines <srhines@google.com> Thu May 21 16:23:36 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 21 16:23:37 2015 +0000
tree ad1131a9367bcbe5518d1aa7d615bd95be23399c
parent 2db531ee1b3a980ea9ee6c7e72ad6d11983500e2
parent 62cb9bdc9def07fefca51939bba4dfb79c122664

Merge "Added in flag to ask context to wait for debugger attach."

rs/java/android/renderscript/RenderScript.java

diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 24bc2c1..0505a4b 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -89,6 +89,13 @@
     */
     public static final int CREATE_FLAG_LOW_POWER = 0x0004;
 
+    /**
+     * @hide
+     * Context creation flag which instructs the implementation to wait for
+     * a debugger to be attached before continuing execution.
+    */
+    public static final int CREATE_FLAG_WAIT_FOR_ATTACH = 0x0008;
+
     /*
      * Detect the bitness of the VM to allow FieldPacker to do the right thing.
      */
@@ -1343,7 +1350,7 @@
             return null;
         }
 
-        if ((flags & ~(CREATE_FLAG_LOW_LATENCY | CREATE_FLAG_LOW_POWER)) != 0) {
+        if ((flags & ~(CREATE_FLAG_LOW_LATENCY | CREATE_FLAG_LOW_POWER | CREATE_FLAG_WAIT_FOR_ATTACH)) != 0) {
             throw new RSIllegalArgumentException("Invalid flags passed.");
         }