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

Fix NPE when inflating GradientDrawables.

Browse Source 
Change-Id: If624d6efac61dabe6009ee4368ad7b119e1d4dcd
This commit is contained in:
Tim Kilbourn
2014-03-25 10:13:02 -07:00
parent 0a8596dc0c
commit 803d91b2b2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/drawable/GradientDrawable.java
View File

@@ -1009,7 +1009,7 @@ public class GradientDrawable extends Drawable {
} }
if (state.mInnerRadius == -1 if (state.mInnerRadius == -1
&& themeAttrs == null || themeAttrs[R.styleable.GradientDrawable_thicknessRatio] == 0) { && (themeAttrs == null || themeAttrs[R.styleable.GradientDrawable_thicknessRatio] == 0)) {
state.mInnerRadiusRatio = a.getFloat( state.mInnerRadiusRatio = a.getFloat(
R.styleable.GradientDrawable_innerRadiusRatio, DEFAULT_INNER_RADIUS_RATIO); R.styleable.GradientDrawable_innerRadiusRatio, DEFAULT_INNER_RADIUS_RATIO);
} }
@@ -1020,7 +1020,7 @@ public class GradientDrawable extends Drawable {
} }
if (state.mThickness == -1 if (state.mThickness == -1
&& themeAttrs == null || themeAttrs[R.styleable.GradientDrawable_thicknessRatio] == 0) { && (themeAttrs == null || themeAttrs[R.styleable.GradientDrawable_thicknessRatio] == 0)) {
state.mThicknessRatio = a.getFloat( state.mThicknessRatio = a.getFloat(
R.styleable.GradientDrawable_thicknessRatio, DEFAULT_THICKNESS_RATIO); R.styleable.GradientDrawable_thicknessRatio, DEFAULT_THICKNESS_RATIO);
} }