Merge "Fix NPE in GradientDrawable#getCornerRadii." into sc-dev

2021-03-24 17:52:18 +00:00
parent ba659c0c51 165995bebe
commit eae4a200d1
1 changed files with 5 additions and 1 deletions
--- 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();
    }

    /**