Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d47d259 authored by Alan Viverette's avatar Alan Viverette
Browse files

If LayerDrawable child doesn't have constant state, use shallow copy 

Avoid NPE if mutate() is called on a LayerDrawable with a child that
doesn't support constant state.

Bug: 25438651
Change-Id: I6bf5a90484fda44a7b5fd10ce7b798eaa799b68e
parent 978db409

graphics/java/android/graphics/drawable/LayerDrawable.java

+3 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,9 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { 
            final Drawable clone;

            if (dr != null) {

                final ConstantState cs = dr.getConstantState();

                if (res != null) {

                if (cs == null) {

                    clone = dr;

                } else if (res != null) {

                    clone = cs.newDrawable(res);

                } else {

                    clone = cs.newDrawable();