diff options
| author | 2019-03-20 14:32:29 -0700 | |
|---|---|---|
| committer | 2019-03-25 13:57:42 -0700 | |
| commit | 6b46fc59d4497b7c3f3233714507dc5e34348aae (patch) | |
| tree | 31af6ed648b54615b9aada31591aaa39104fa6f4 /graphics/java/android | |
| parent | 30115c998c7dc8b490326dc52eb0d043fdaee587 (diff) | |
Fix empty CompositePositionUpdateListener
ArrayUtils methods can return null. Fix the assumption made by CPUL.
Test: atest android.view.cts.SystemGestureExclusionRectsTest
Change-Id: I513e179b9a5715c381218a1ceb7e35dc91d1797a
Diffstat (limited to 'graphics/java/android')
| -rw-r--r-- | graphics/java/android/graphics/RenderNode.java | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |