From 08d7d0398e74c257db66e23d4b1359f97b925deb Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Wed, 6 Mar 2019 12:33:51 -0800 Subject: Add check for input allocation type for ScriptIntrinsicBlur. Bug: 124466617 Test: mm Test: CtsRenderscriptTestCases Change-Id: I4784b96b5f96749d503bd1de8360e74b72f3f5c2 --- rs/java/android/renderscript/ScriptIntrinsicBlur.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'rs/java/android/renderscript/ScriptIntrinsicBlur.java') diff --git a/rs/java/android/renderscript/ScriptIntrinsicBlur.java b/rs/java/android/renderscript/ScriptIntrinsicBlur.java index a36873e34d8c..0891d5142022 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicBlur.java +++ b/rs/java/android/renderscript/ScriptIntrinsicBlur.java @@ -62,6 +62,10 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic { if (ain.getType().getY() == 0) { throw new RSIllegalArgumentException("Input set to a 1D Allocation"); } + Element e = ain.getElement(); + if ((!e.isCompatible(Element.U8_4(mRS))) && (!e.isCompatible(Element.U8(mRS)))) { + throw new RSIllegalArgumentException("Unsupported element type."); + } mInput = ain; setVar(1, ain); } -- cgit v1.2.3