Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 217974cb authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has... 

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

* commit 'c6296a76':
  Prevent crash when ColorStateList has unresolved attrs
parents ccb8616a c6296a76

core/java/android/content/res/ColorStateList.java

+8 −6
Original line number Diff line number Diff line
@@ -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();

            }

        }