Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-25 22:10:36 +00:00
committed by Android (Google) Code Review
parent 436308f88b 6f9626a1c2
commit 68d180bbd1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/java/android/graphics/drawable/LayerDrawable.java
View File

@@ -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();
}
} }
} }