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

am 803d91b2: Fix NPE when inflating GradientDrawables.

Browse Source 
* commit '803d91b2b2eef42e1ebe088613f83e555d2bfd04':
  Fix NPE when inflating GradientDrawables.
This commit is contained in:
Tim Kilbourn
2014-03-25 10:26:09 -07:00
committed by Android Git Automerger
parent 7c31572061 803d91b2b2
commit e675214a60
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
&& themeAttrs == null || themeAttrs[R.styleable.GradientDrawable_thicknessRatio] == 0) {
&& (themeAttrs == null || themeAttrs[R.styleable.GradientDrawable_thicknessRatio] == 0)) {
state.mInnerRadiusRatio = a.getFloat(
R.styleable.GradientDrawable_innerRadiusRatio, DEFAULT_INNER_RADIUS_RATIO);
}
@@ -1020,7 +1020,7 @@ public class GradientDrawable extends Drawable {
}
if (state.mThickness == -1
&& themeAttrs == null || themeAttrs[R.styleable.GradientDrawable_thicknessRatio] == 0) {
&& (themeAttrs == null || themeAttrs[R.styleable.GradientDrawable_thicknessRatio] == 0)) {
state.mThicknessRatio = a.getFloat(
R.styleable.GradientDrawable_thicknessRatio, DEFAULT_THICKNESS_RATIO);
}