Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'e182bfd4dcf35d5009bcae72356b999b5ead0433':
  Prevent NPE when cloning gradients Bug #10436856
This commit is contained in:
Romain Guy
2013-09-03 16:35:53 -07:00
committed by Android Git Automerger
parent a7cd8835bb e182bfd4dc
commit 9a160a52b9
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/LinearGradient.java
View File

@@ -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);

4
graphics/java/android/graphics/RadialGradient.java
View File

@@ -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);

3
graphics/java/android/graphics/SweepGradient.java
View File

@@ -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);