From 6b46fc59d4497b7c3f3233714507dc5e34348aae Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 20 Mar 2019 14:32:29 -0700 Subject: Fix empty CompositePositionUpdateListener ArrayUtils methods can return null. Fix the assumption made by CPUL. Test: atest android.view.cts.SystemGestureExclusionRectsTest Change-Id: I513e179b9a5715c381218a1ceb7e35dc91d1797a --- graphics/java/android/graphics/RenderNode.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/RenderNode.java b/graphics/java/android/graphics/RenderNode.java index 9b4f2c1b51d5..ae7fe6c46f2f 100644 --- a/graphics/java/android/graphics/RenderNode.java +++ b/graphics/java/android/graphics/RenderNode.java @@ -284,9 +284,10 @@ public final class RenderNode { private static final class CompositePositionUpdateListener implements PositionUpdateListener { private final PositionUpdateListener[] mListeners; + private static final PositionUpdateListener[] sEmpty = new PositionUpdateListener[0]; CompositePositionUpdateListener(PositionUpdateListener... listeners) { - mListeners = listeners; + mListeners = listeners != null ? listeners : sEmpty; } public CompositePositionUpdateListener with(PositionUpdateListener listener) { -- cgit v1.2.3-59-g8ed1b