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

2017-05-26 20:54:49 +00:00
parent b25f52c042 a7cec30f98
commit bd8fb0e71d
1 changed files with 5 additions and 2 deletions
--- a/core/java/android/view/LayoutInflater.java
+++ b/core/java/android/view/LayoutInflater.java
@@ -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.