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

Commit d16d1788 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

Merge "Prevent NPE when draw is called without bounds being set Test: unit... 

Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev
am: 891e0320

Change-Id: I14746f95c369503f5515e5123a481798fc76197c
parents f00900d7 891e0320

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

+3 −0
Original line number Diff line number Diff line
@@ -304,6 +304,9 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback 


    @Override

    public void draw(Canvas canvas) {

        if (mLayersBitmap == null) {

            return;

        }

        if (mLayersShader == null) {

            mCanvas.setBitmap(mLayersBitmap);

            for (int i = 0; i < mLayerState.N_CHILDREN; i++) {