commit 9b25b77feb09119710713a81978dbbcdcb2f0c40
author Jason Sams <jsams@google.com> Thu Mar 26 22:53:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 26 22:53:19 2015 +0000
tree 79653f9a4b50764aab7a13a59ef87c7c68a1d9ad
parent ff3ed45537f9566686efbab2a9f57333e40cf83d
parent d641bb009912818a1eb68bb46bfaf3af08318ea7

am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown object types."

* commit 'd641bb009912818a1eb68bb46bfaf3af08318ea7':
  Catch errors for unknown object types.

rs/java/android/renderscript/FileA3D.java

diff --git a/rs/java/android/renderscript/FileA3D.java b/rs/java/android/renderscript/FileA3D.java
index 4164810..9d8f162 100644
--- a/rs/java/android/renderscript/FileA3D.java
+++ b/rs/java/android/renderscript/FileA3D.java
@@ -145,6 +145,9 @@
             case MESH:
                 entry.mLoadedObj = new Mesh(objectID, rs);
                 break;
+
+            default:
+                throw new RSRuntimeException("Unrecognized object type in file.");
             }
 
             entry.mLoadedObj.updateFromNative();