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

Commit 6f9626a1 authored by Alan Viverette's avatar Alan Viverette
Browse files

Check for null drawable during LayerDrawable.jumpToCurrentState() 

Child drawables specified as theme attributes may not have been
initialized yet.

Bug: 28371482
Change-Id: I8452a7c5b8f74368c58ba3373336bf7d650af7a3
parent 93536af5

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

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




    @Override

    @Override

    public void jumpToCurrentState() {

    public void jumpToCurrentState() {

        final ChildDrawable[] children = mLayerState.mChildren;

        final ChildDrawable[] array = mLayerState.mChildren;

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

        final int N = mLayerState.mNum;

            children[i].mDrawable.jumpToCurrentState();

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

            final Drawable dr = array[i].mDrawable;

            if (dr != null) {

                dr.jumpToCurrentState();

            }

        }

        }

    }

    }