diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2019-03-08 15:29:09 -0800 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2019-03-08 15:29:09 -0800 |
| commit | 02d7f45afa7f7fcf18095a78b4c194907fab6033 (patch) | |
| tree | 1ed3a813b3b7c393d03161b106fdcb70ef34ea88 /core/java | |
| parent | a091cc2d8b3ac4caae4f5400174927753d59477e (diff) | |
Fix getAttributeSetSourceResId to AttributeSet created from null.
Xml.asAttributeSet with a null returns non XmlBlock.Parser type
object.
This fixes the existing test that broke due to my changes to
LayoutInflater.
Test: atest CtsViewTestCases:LayoutInflaterTest
Change-Id: Ib10e07ef3814c5570a6d2bd334481f2e26bb3d3e
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/ResourcesImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index 565cd3375c32..633966c38786 100644 --- 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(); |