From e597d68d33c76c2b830f5497ed4ba74c5193a056 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Thu, 1 Jun 2017 17:16:44 -0700 Subject: AAPT2: Allow any value type for without format attr TO bring AAPT2 behavior in-line with AAPT, has a default format of "any", and only becomes restricted with an explicit format attribute. Bug: 62260121 Test: make aapt2_tests Change-Id: Ife416f520e6c2710bb30e3ba3f2d4463794bfa06 --- tools/aapt2/ResourceParser.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tools/aapt2/ResourceParser.cpp') diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp index 57ae2700127c..32e0fd52acfa 100644 --- a/tools/aapt2/ResourceParser.cpp +++ b/tools/aapt2/ResourceParser.cpp @@ -415,6 +415,10 @@ bool ResourceParser::ParseResource(xml::XmlPullParser* parser, if (resource_type == "item") { can_be_bag = false; + // The default format for is any. If a format attribute is present, that one will + // override the default. + resource_format = android::ResTable_map::TYPE_ANY; + // Items have their type encoded in the type attribute. if (Maybe maybe_type = xml::FindNonEmptyAttribute(parser, "type")) { resource_type = maybe_type.value().to_string(); @@ -481,8 +485,8 @@ bool ResourceParser::ParseResource(xml::XmlPullParser* parser, out_resource->name.type = item_iter->second.type; out_resource->name.entry = maybe_name.value().to_string(); - // Only use the implicit format for this type if it wasn't overridden. - if (!resource_format) { + // Only use the implied format of the type when there is no explicit format. + if (resource_format == 0u) { resource_format = item_iter->second.format; } -- cgit v1.2.3-59-g8ed1b