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

Commit 616d25e3 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 460572b2: Merge "Fix attribute extraction, use color attrs in Quantum drawables" 

* commit '460572b2':
  Fix attribute extraction, use color attrs in Quantum drawables
parents cdc569ee 460572b2

api/current.txt

+171 −174

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/content/res/TypedArray.java

+2 −3
Original line number Diff line number Diff line
@@ -793,10 +793,9 @@ public class TypedArray { 
    public int[] extractThemeAttrs() {

        int[] attrs = null;



        final int N = getIndexCount();

        final int N = length();

        for (int i = 0; i < N; i++) {

            final int index = getIndex(i);

            final int attrId = getThemeAttributeId(index, 0);

            final int attrId = getThemeAttributeId(i, 0);

            if (attrId != 0) {

                if (attrs == null) {

                    attrs = new int[N];