diff options
| author | Jason Sams <jsams@google.com> | 2015-03-26 22:53:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-26 22:53:19 +0000 |
| commit | 9b25b77feb09119710713a81978dbbcdcb2f0c40 (patch) | |
| tree | 79653f9a4b50764aab7a13a59ef87c7c68a1d9ad /rs/java | |
| parent | ff3ed45537f9566686efbab2a9f57333e40cf83d (diff) | |
| parent | d641bb009912818a1eb68bb46bfaf3af08318ea7 (diff) | |
| download | frameworks_base-9b25b77feb09119710713a81978dbbcdcb2f0c40.zip frameworks_base-9b25b77feb09119710713a81978dbbcdcb2f0c40.tar.gz frameworks_base-9b25b77feb09119710713a81978dbbcdcb2f0c40.tar.bz2 | |
am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown object types."
* commit 'd641bb009912818a1eb68bb46bfaf3af08318ea7':
Catch errors for unknown object types.
Diffstat (limited to 'rs/java')
| -rw-r--r-- | rs/java/android/renderscript/FileA3D.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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(); |