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

am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev

Browse Source 
* commit '0ee2c1aef93987663968dbfd693cc5eda06c8244':
  Prevent crash when ColorStateList has unresolved attrs
This commit is contained in:
Alan Viverette
2015-06-01 18:05:09 +00:00
committed by Android Git Automerger
parent 21f55342d6 0ee2c1aef9
commit c6296a7686
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/content/res/ColorStateList.java
View File

@@ -382,6 +382,14 @@ public class ColorStateList implements Parcelable {
defaultAlphaMod = 1.0f;
}
// Extract the theme attributes, if any, before attempting to
// read from the typed array. This prevents a crash if we have
// unresolved attrs.
themeAttrsList[i] = a.extractThemeAttrs(themeAttrsList[i]);
if (themeAttrsList[i] != null) {
hasUnresolvedAttrs = true;
}
final int baseColor = a.getColor(
R.styleable.ColorStateListItem_color, mColors[i]);
final float alphaMod = a.getFloat(
@@ -391,12 +399,6 @@ public class ColorStateList implements Parcelable {
// Account for any configuration changes.
mChangingConfigurations |= a.getChangingConfigurations();
// Extract the theme attributes, if any.
themeAttrsList[i] = a.extractThemeAttrs(themeAttrsList[i]);
if (themeAttrsList[i] != null) {
hasUnresolvedAttrs = true;
}
a.recycle();
}
}