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

Fix NPE in RoundRectShape.

Browse Source 
Change-Id: I3cef1b2723e5ebf3583f91b1bfe8121c0f6d253d
This commit is contained in:
Romain Guy
2010-08-06 14:27:30 -07:00
parent 145b0c8be7
commit 9e044aed21
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/java/android/graphics/drawable/shapes/RoundRectShape.java
View File

@@ -57,13 +57,11 @@ public class RoundRectShape extends RectShape {
*/
public RoundRectShape(float[] outerRadii, RectF inset,
float[] innerRadii) {
if (outerRadii.length < 8) {
throw new ArrayIndexOutOfBoundsException(
"outer radii must have >= 8 values");
if (outerRadii != null && outerRadii.length < 8) {
throw new ArrayIndexOutOfBoundsException("outer radii must have >= 8 values");
}
if (innerRadii != null && innerRadii.length < 8) {
throw new ArrayIndexOutOfBoundsException(
"inner radii must have >= 8 values");
throw new ArrayIndexOutOfBoundsException("inner radii must have >= 8 values");
}
mOuterRadii = outerRadii;
mInset = inset;
@@ -97,8 +95,7 @@ public class RoundRectShape extends RectShape {
r.right - mInset.right, r.bottom - mInset.bottom);
if (mInnerRect.width() < w && mInnerRect.height() < h) {
if (mInnerRadii != null) {
mPath.addRoundRect(mInnerRect, mInnerRadii,
Path.Direction.CCW);
mPath.addRoundRect(mInnerRect, mInnerRadii, Path.Direction.CCW);
} else {
mPath.addRect(mInnerRect, Path.Direction.CCW);
}
@@ -109,8 +106,8 @@ public class RoundRectShape extends RectShape {
@Override
public RoundRectShape clone() throws CloneNotSupportedException {
RoundRectShape shape = (RoundRectShape) super.clone();
shape.mOuterRadii = mOuterRadii.clone();
shape.mInnerRadii = mInnerRadii.clone();
shape.mOuterRadii = mOuterRadii != null ? mOuterRadii.clone() : null;
shape.mInnerRadii = mInnerRadii != null ? mInnerRadii.clone() : null;
shape.mInset = new RectF(mInset);
shape.mInnerRect = new RectF(mInnerRect);
shape.mPath = new Path(mPath);