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

Commit e182bfd4 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE when cloning gradients Bug #10436856" into klp-dev

parents a861245f 9622adf6

graphics/java/android/graphics/LinearGradient.java

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ public class LinearGradient extends Shader { 
        final LinearGradient copy;

        switch (mType) {

            case TYPE_COLORS_AND_POSITIONS:

                copy = new LinearGradient(mX0, mY0, mX1, mY1, mColors.clone(), mPositions.clone(),

                        mTileMode);

                copy = new LinearGradient(mX0, mY0, mX1, mY1, mColors.clone(),

                        mPositions != null ? mPositions.clone() : null, mTileMode);

                break;

            case TYPE_COLOR_START_AND_COLOR_END:

                copy = new LinearGradient(mX0, mY0, mX1, mY1, mColor0, mColor1, mTileMode);

graphics/java/android/graphics/RadialGradient.java

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ public class RadialGradient extends Shader { 
        final RadialGradient copy;

        switch (mType) {

            case TYPE_COLORS_AND_POSITIONS:

                copy = new RadialGradient(mX, mY, mRadius, mColors.clone(), mPositions.clone(),

                        mTileMode);

                copy = new RadialGradient(mX, mY, mRadius, mColors.clone(),

                        mPositions != null ? mPositions.clone() : null, mTileMode);

                break;

            case TYPE_COLOR_CENTER_AND_COLOR_EDGE:

                copy = new RadialGradient(mX, mY, mRadius, mColor0, mColor1, mTileMode);

graphics/java/android/graphics/SweepGradient.java

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ public class SweepGradient extends Shader { 
        final SweepGradient copy;

        switch (mType) {

            case TYPE_COLORS_AND_POSITIONS:

                copy = new SweepGradient(mCx, mCy, mColors.clone(), mPositions.clone());

                copy = new SweepGradient(mCx, mCy, mColors.clone(),

                        mPositions != null ? mPositions.clone() : null);

                break;

            case TYPE_COLOR_START_AND_COLOR_END:

                copy = new SweepGradient(mCx, mCy, mColor0, mColor1);