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

Commit a0cd0bb7 authored by Nader Jawad's avatar Nader Jawad Committed by android-build-merger
Browse files

Merge "Added null checks to LayerDrawable implementation" into qt-dev 

am: 6e4e9817

Change-Id: I6c05153db17f73226da4b571b001f19d007e5388
parents 447ae2dd 6e4e9817

graphics/java/android/graphics/drawable/LayerDrawable.java

+8 −4
Original line number Diff line number Diff line
@@ -139,9 +139,12 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { 
        final ChildDrawable[] r = new ChildDrawable[length];

        for (int i = 0; i < length; i++) {

            r[i] = new ChildDrawable(mLayerState.mDensity);

            r[i].mDrawable = layers[i];

            layers[i].setCallback(this);

            mLayerState.mChildrenChangingConfigurations |= layers[i].getChangingConfigurations();

            Drawable child = layers[i];

            r[i].mDrawable = child;

            if (child != null) {

                child.setCallback(this);

                mLayerState.mChildrenChangingConfigurations |= child.getChangingConfigurations();

            }

        }

        mLayerState.mNumChildren = length;

        mLayerState.mChildren = r;
@@ -416,7 +419,8 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { 
        final ChildDrawable[] layers = mLayerState.mChildren;

        final int N = mLayerState.mNumChildren;

        for (int i = 0; i < N; i++) {

            if (layers[i].mDrawable.isProjected()) {

            Drawable childDrawable = layers[i].mDrawable;

            if (childDrawable != null && childDrawable.isProjected()) {

                return true;

            }

        }