From 165995bebe5ae7efc34e480b7223ce934c502442 Mon Sep 17 00:00:00 2001
From: Jordan Demeulenaere <jdemeulenaere@google.com>
Date: Wed, 24 Mar 2021 15:32:56 +0100
Subject: [PATCH] Fix NPE in GradientDrawable#getCornerRadii.

Bug: 183603359
Test: atest GradientDrawableTest
Change-Id: Ia81adff60e3e9831f0119826636e75f57420932f
---
 .../java/android/graphics/drawable/GradientDrawable.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index 24d73efebe543..3616a4d663997 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -276,7 +276,11 @@ public class GradientDrawable extends Drawable {
      */
     @Nullable
     public float[] getCornerRadii() {
-        return mGradientState.mRadiusArray.clone();
+        float[] radii = mGradientState.mRadiusArray;
+        if (radii == null) {
+            return null;
+        }
+        return radii.clone();
     }
 
     /**