summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2012-02-02 21:28:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-02 21:28:17 -0800
commit0a29fe1be19df6d96c1e5df0f1b551a6b14dc60c (patch)
treebc11d5db3163f5b4f135c56b1400c8718eb8268c /graphics/java
parentd9d9a2f5d58dc6e1d4d516a1e17a60f873d4497d (diff)
parentcc2daede56257f0f1f490a1aebf5b9b898d9816a (diff)
downloadframeworks_base-0a29fe1be19df6d96c1e5df0f1b551a6b14dc60c.zip
frameworks_base-0a29fe1be19df6d96c1e5df0f1b551a6b14dc60c.tar.gz
frameworks_base-0a29fe1be19df6d96c1e5df0f1b551a6b14dc60c.tar.bz2
am cc2daede: Merge "Properly recover from failed compilation."
* commit 'cc2daede56257f0f1f490a1aebf5b9b898d9816a': Properly recover from failed compilation.
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/renderscript/RenderScript.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index ffe2e22..5f55398 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -848,7 +848,7 @@ public class RenderScript {
mRS.mErrorCallback.mErrorNum = subID;
mRS.mErrorCallback.run();
} else {
- //throw new RSRuntimeException("Received error num " + subID + ", details: " + e);
+ throw new RSRuntimeException("Received error num " + subID + ", details: " + e);
}
continue;
}