summaryrefslogtreecommitdiff
path: root/rs/java/android
diff options
context:
space:
mode:
author Pirama Arumuga Nainar <pirama@google.com> 2016-03-29 03:56:58 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-03-29 03:56:58 +0000
commit994db1bb2c0f4a480d6361b5659906ba8f3cf26e (patch)
tree3d3d45fc287ed27b75c96a1621b15c8892313c64 /rs/java/android
parent64ade5dcfc1f7adabaa67bb5fdd97554380346b9 (diff)
parent598d37f670bf525f131cb3be52bd72e640ad0018 (diff)
Merge "[RenderScript] Fail with Exception from validateObjectIsPrimitiveArray"
Diffstat (limited to 'rs/java/android')
-rw-r--r--rs/java/android/renderscript/Allocation.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 6bcb5b6afc72..57c45a763e41 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -142,7 +142,10 @@ public class Allocation extends BaseObj {
}
return Element.DataType.FLOAT_64;
}
- return null;
+
+ throw new RSIllegalArgumentException("Parameter of type " + cmp.getSimpleName() +
+ "[] is not compatible with data type " + mType.mElement.mType.name() +
+ " of allocation");
}