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

Commit 6be507cc authored by Phil Dubach's avatar Phil Dubach
Browse files

Fix NullPointerException in DrawableContainer.mutate() 

DrawableContainerState.mDrawables is an array which may be only partially
filled, as can be seen in the constructor and the addChild() method.

DrawableContainer.mutate() wrongly assumed that the array does not contain
null references.
parent 66c2942a

graphics/java/android/graphics/drawable/DrawableContainer.java

+4 −2
Original line number Diff line number Diff line
@@ -234,8 +234,10 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 
    @Override

    public Drawable mutate() {

        if (!mMutated && super.mutate() == this) {

            for (Drawable child : mDrawableContainerState.mDrawables) {

                child.mutate();

            final int N = mDrawableContainerState.getChildCount();

            final Drawable[] drawables = mDrawableContainerState.getChildren();

            for (int i = 0; i < N; i++) {

                drawables[i].mutate();

            }

            mMutated = true;

        }