From 598d37f670bf525f131cb3be52bd72e640ad0018 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Mon, 28 Mar 2016 12:00:00 -0700 Subject: [RenderScript] Fail with Exception from validateObjectIsPrimitiveArray Bug: http://b/25982676 Instead of returning null from validateObjectIsPrimitiveArray, fail with an exception. The callers of this function do not check for null. Change-Id: Idd2b50a7b137e8d2db7a334bb9a48c1b19ee2403 --- rs/java/android/renderscript/Allocation.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'rs/java/android') 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"); } -- cgit v1.2.3-59-g8ed1b