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

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

Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev 

am: 0f1ae5fa

* commit '0f1ae5fa':
  Prevent callbacks during DrawableContainer child initialization

Change-Id: Iaabeeac46bf1e2205e629375fb8e0bfa9bfa9761
parents c1434b45 0f1ae5fa

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

+35 −25
Original line number Diff line number Diff line
@@ -500,6 +500,13 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 
     * @param d The drawable to initialize.

     */

    private void initializeDrawableForDisplay(Drawable d) {

        // Temporary fix for suspending callbacks during initialization. We

        // don't want any of these setters causing an invalidate() since that

        // may call back into DrawableContainer.

        final Callback cb = d.getCallback();

        d.setCallback(null);



        try {

            if (mDrawableContainerState.mEnterFadeDuration <= 0 && mHasAlpha) {

                d.setAlpha(mAlpha);

            }
@@ -529,6 +536,9 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 
                d.setHotspotBounds(hotspotBounds.left, hotspotBounds.top,

                        hotspotBounds.right, hotspotBounds.bottom);

            }

        } finally {

            d.setCallback(cb);

        }

    }



    void animate(boolean schedule) {