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

Commit 891e0320 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
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
parents 713b7c6b 55211c03

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++) {