diff options
| author | Divya Sharma <divyash@codeaurora.org> | 2018-02-27 08:32:05 -0800 |
|---|---|---|
| committer | Divya Sharma <divyash@codeaurora.org> | 2018-02-27 08:32:05 -0800 |
| commit | 4e4914b22b779e6376bb00ae20636175b2a70d8c (patch) | |
| tree | f4ebc5eae2c99e20aceefcc9ffc3de19782f0fbe /tools/aapt2/xml/XmlDom.cpp | |
| parent | dbed40a3cd31af821ea99c605664908d67df2747 (diff) | |
| parent | ed5d4d06907844e1c87a6ee17c4f2868a8cc6d56 (diff) | |
PPR1.180219.001_AOSP_Merge
Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
packages/SystemUI/res/values/config.xml
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
telecomm/java/android/telecom/Call.java
telecomm/java/android/telecom/Connection.java
telecomm/java/android/telecom/ConnectionService.java
Change-Id: I524d38a61608069028b3496a189118d8eff75f4b
Diffstat (limited to 'tools/aapt2/xml/XmlDom.cpp')
| -rw-r--r-- | tools/aapt2/xml/XmlDom.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/aapt2/xml/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp index fddb6b8c5d87..7b748ce78cbc 100644 --- a/tools/aapt2/xml/XmlDom.cpp +++ b/tools/aapt2/xml/XmlDom.cpp @@ -244,14 +244,13 @@ static void CopyAttributes(Element* el, android::ResXMLParser* parser, StringPoo str16 = parser->getAttributeStringValue(i, &len); if (str16) { attr.value = util::Utf16ToUtf8(StringPiece16(str16, len)); - } else { - android::Res_value res_value; - if (parser->getAttributeValue(i, &res_value) > 0) { - attr.compiled_value = ResourceUtils::ParseBinaryResValue( - ResourceType::kAnim, {}, parser->getStrings(), res_value, out_pool); - } } + android::Res_value res_value; + if (parser->getAttributeValue(i, &res_value) > 0) { + attr.compiled_value = ResourceUtils::ParseBinaryResValue( + ResourceType::kAnim, {}, parser->getStrings(), res_value, out_pool); + } el->attributes.push_back(std::move(attr)); } |