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

Commit 2f5608f3 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Resolve inflate attr against default package" into oc-dev am: bd8fb0e7

am: 9c010830

Change-Id: Icbf1a40dee9adc71785f21d8d4ba0b3f78c3e3ed
parents 342acbfd 9c010830
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -923,8 +923,11 @@ public abstract class LayoutInflater {
                            + " include tag: <include layout=\"@layout/layoutID\" />");
                }

                // Attempt to resolve the "?attr/name" string to an identifier.
                layout = context.getResources().getIdentifier(value.substring(1), null, null);
                // Attempt to resolve the "?attr/name" string to an attribute
                // within the default (e.g. application) package.
                layout = context.getResources().getIdentifier(
                        value.substring(1), "attr", context.getPackageName());

            }

            // The layout might be referencing a theme attribute.