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

Commit caf83ad2 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Always mutate child when added to drawable container" into nyc-dev am:... 

Merge "Always mutate child when added to drawable container" into nyc-dev am: d1f686f5 am: 42d49010
am: 163e3bf7

* commit '163e3bf7':
  Always mutate child when added to drawable container

Change-Id: I2ea6455065e2c790869c8fb3b5b4ec31c99fedfa
parents 48fd9ed7 163e3bf7

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

+7 −1
Original line number Diff line number Diff line
@@ -786,13 +786,19 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 
            return mChangingConfigurations | mChildrenChangingConfigurations;

        }



        /**

         * Adds the drawable to the end of the list of contained drawables.

         *

         * @param dr the drawable to add

         * @return the position of the drawable within the container

         */

        public final int addChild(Drawable dr) {

            final int pos = mNumChildren;



            if (pos >= mDrawables.length) {

                growArray(pos, pos+10);

            }



            dr.mutate();

            dr.setVisible(false, true);

            dr.setCallback(mOwner);