summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-03-26 22:59:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-26 22:59:40 +0000
commitd640b7a6c7ac0998a9f55bdcfff6bf2960edb9bd (patch)
tree60444f844bf44a8378d2089d39276a83d7dde9ab /rs
parent9d501de5f4673bb82f660808e176bc86879723e5 (diff)
parent9b25b77feb09119710713a81978dbbcdcb2f0c40 (diff)
downloadframeworks_base-d640b7a6c7ac0998a9f55bdcfff6bf2960edb9bd.zip
frameworks_base-d640b7a6c7ac0998a9f55bdcfff6bf2960edb9bd.tar.gz
frameworks_base-d640b7a6c7ac0998a9f55bdcfff6bf2960edb9bd.tar.bz2
am 9b25b77f: am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown object types."
* commit '9b25b77feb09119710713a81978dbbcdcb2f0c40': Catch errors for unknown object types.
Diffstat (limited to 'rs')
-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 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();