summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Sams <jsams@google.com> 2015-03-26 22:45:48 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-26 22:45:48 +0000
commitd641bb009912818a1eb68bb46bfaf3af08318ea7 (patch)
treebba39a27c2dabdfdedb73c5f3018ebda5762eb5a
parentb04f9944fb0062541512447a952405ba4b084d30 (diff)
parent73ffe0cc23dd094e720b947b4daefac90e98524b (diff)
am 73ffe0cc: Merge "Catch errors for unknown object types."
* commit '73ffe0cc23dd094e720b947b4daefac90e98524b': Catch errors for unknown object types.
-rw-r--r--rs/java/android/renderscript/FileA3D.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/FileA3D.java b/rs/java/android/renderscript/FileA3D.java
index 41648101cc88..9d8f1624a051 100644
--- a/rs/java/android/renderscript/FileA3D.java
+++ b/rs/java/android/renderscript/FileA3D.java
@@ -145,6 +145,9 @@ public class FileA3D extends BaseObj {
case MESH:
entry.mLoadedObj = new Mesh(objectID, rs);
break;
+
+ default:
+ throw new RSRuntimeException("Unrecognized object type in file.");
}
entry.mLoadedObj.updateFromNative();