diff options
author | Adam Lesinski <adamlesinski@google.com> | 2015-05-12 21:42:59 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2015-05-12 21:56:43 -0700 |
commit | dfa5e0705ff82f15e228ba076bc192893bcbe118 (patch) | |
tree | 10dbca8e4feeefc96019fcab8fa08c7943b8c97e /tools/aapt2/ResourceParser.cpp | |
parent | d13fb249865703901b77f48c5fed1864f06e1c63 (diff) | |
download | frameworks_base-dfa5e0705ff82f15e228ba076bc192893bcbe118.zip frameworks_base-dfa5e0705ff82f15e228ba076bc192893bcbe118.tar.gz frameworks_base-dfa5e0705ff82f15e228ba076bc192893bcbe118.tar.bz2 |
AAPT2: Fix issue where @null was wrongly encoded
@null must be encoded as TYPE_REFERENCE with a value of
0. TYPE_NULL is used by the runtime as a placeholder when resolving
style attributes. If we set a style attribute to TYPE_NULL,
the runtime will throw. The runtime will convert a TYPE_REFERENCE
with value 0 to a proper null value.
Change-Id: Id983ca7e1fbee3124dddafe32f1b5741b824225b
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
-rw-r--r-- | tools/aapt2/ResourceParser.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp index 59915a2..13f916b 100644 --- a/tools/aapt2/ResourceParser.cpp +++ b/tools/aapt2/ResourceParser.cpp @@ -193,18 +193,18 @@ std::unique_ptr<Reference> ResourceParser::tryParseReference(const StringPiece16 std::unique_ptr<BinaryPrimitive> ResourceParser::tryParseNullOrEmpty(const StringPiece16& str) { StringPiece16 trimmedStr(util::trimWhitespace(str)); - uint32_t data = 0; + android::Res_value value = {}; if (trimmedStr == u"@null") { - data = android::Res_value::DATA_NULL_UNDEFINED; + // TYPE_NULL with data set to 0 is interpreted by the runtime as an error. + // Instead we set the data type to TYPE_REFERENCE with a value of 0. + value.dataType = android::Res_value::TYPE_REFERENCE; } else if (trimmedStr == u"@empty") { - data = android::Res_value::DATA_NULL_EMPTY; + // TYPE_NULL with value of DATA_NULL_EMPTY is handled fine by the runtime. + value.dataType = android::Res_value::TYPE_NULL; + value.data = android::Res_value::DATA_NULL_EMPTY; } else { return {}; } - - android::Res_value value = {}; - value.dataType = android::Res_value::TYPE_NULL; - value.data = data; return util::make_unique<BinaryPrimitive>(value); } |