Merge change 5718 into donut

* changes:
  Fix NullPointerException in DrawableContainer.mutate()
This commit is contained in:
Android (Google) Code Review
2009-06-29 20:09:27 -07:00

View File

@@ -234,8 +234,10 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
@Override
public Drawable mutate() {
if (!mMutated && super.mutate() == this) {
for (Drawable child : mDrawableContainerState.mDrawables) {
child.mutate();
final int N = mDrawableContainerState.getChildCount();
final Drawable[] drawables = mDrawableContainerState.getChildren();
for (int i = 0; i < N; i++) {
drawables[i].mutate();
}
mMutated = true;
}