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

Commit 91a546d4 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 083928fe: Merge change 5718 into donut 

Merge commit '083928fe'

* commit '083928fe':
  Fix NullPointerException in DrawableContainer.mutate()
parents 71b62d29 083928fe

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;

        }