Merge "Fix getAttributeSetSourceResId to AttributeSet created from null."

2019-03-09 03:51:55 +00:00
parent e035a1fd2e 02d7f45afa
commit 7233ef9c09
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -1303,7 +1303,7 @@ public class ResourcesImpl {

    @AnyRes
    static int getAttributeSetSourceResId(@Nullable AttributeSet set) {
-        if (set == null) {
+        if (set == null || !(set instanceof XmlBlock.Parser)) {
            return ID_NULL;
        }
        return ((XmlBlock.Parser) set).getSourceResId();