From 6f9626a1c27d29c67881aa22de3c19804b535ddb Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 25 Apr 2016 11:28:17 -0400
Subject: [PATCH] Check for null drawable during
 LayerDrawable.jumpToCurrentState()

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

Bug: 28371482
Change-Id: I8452a7c5b8f74368c58ba3373336bf7d650af7a3
---
 .../java/android/graphics/drawable/LayerDrawable.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java
index d9c3a02f02d73..c67b0081456ba 100644
--- a/graphics/java/android/graphics/drawable/LayerDrawable.java
+++ b/graphics/java/android/graphics/drawable/LayerDrawable.java
@@ -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();
+            }
         }
     }