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

Commit 55211c03 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Prevent NPE when draw is called without bounds being set 

Test: unit test inside AdaptiveIconDrawableTest.java

Change-Id: Ic3260ce9c6bae595c7eba7be1cd7ae249939a1cf
parent 21a5edcc

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