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

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

Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev 

am: 68d180bb

* commit '68d180bb':
  Check for null drawable during LayerDrawable.jumpToCurrentState()

Change-Id: Ida4daa96fdbee8b2d566ddb054f82af9120a86f3
parents 5bc622e4 68d180bb

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

+7 −3
Original line number Diff line number Diff line
@@ -1419,9 +1419,13 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { 


    @Override

    public void jumpToCurrentState() {

        final ChildDrawable[] children = mLayerState.mChildren;

        for (int i = 0, count = mLayerState.mNum; i < count; i++) {

            children[i].mDrawable.jumpToCurrentState();

        final ChildDrawable[] array = mLayerState.mChildren;

        final int N = mLayerState.mNum;

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

            final Drawable dr = array[i].mDrawable;

            if (dr != null) {

                dr.jumpToCurrentState();

            }

        }

    }