Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acde95c3 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

No new attributes in declare-styleables when format is not provided 

AAPT does not allow for attributes declared in declare-styleables
that do not have a format to create new attribute resources. AAPT2
does and should not.

Bug: 131100106
Test: aapt2_tests
Change-Id: Id00884dc9ed939672df90f670a7915d4b6d232c1
parent 4848dd5e

tools/aapt2/ResourceParser.cpp

+8 −1
Original line number Diff line number Diff line
@@ -1712,7 +1712,14 @@ bool ResourceParser::ParseDeclareStyleable(xml::XmlPullParser* parser, 
      child_ref.SetSource(item_source);

      styleable->entries.push_back(std::move(child_ref));



      // Do not add referenced attributes that do not define a format to the table.

      CHECK(child_resource.value != nullptr);

      Attribute* attr = ValueCast<Attribute>(child_resource.value.get());



      CHECK(attr != nullptr);

      if (attr->type_mask != android::ResTable_map::TYPE_ANY) {

        out_resource->child_resources.push_back(std::move(child_resource));

      }



    } else if (!ShouldIgnoreElement(element_namespace, element_name)) {

      diag_->Error(DiagMessage(item_source) << "unknown tag <"

tools/aapt2/ResourceParser_test.cpp

+2 −3
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ TEST_F(ResourceParserTest, ParseAttrAndDeclareStyleableUnderConfigButRecordAsNoC 
  std::string input = R"(

      <attr name="foo" />

      <declare-styleable name="bar">

        <attr name="baz" />

        <attr name="baz" format="reference"/>

      </declare-styleable>)";

  ASSERT_TRUE(TestParse(input, watch_config));
@@ -589,8 +589,7 @@ TEST_F(ResourceParserTest, ParseAttributesDeclareStyleable) { 
  EXPECT_THAT(result.value().entry->visibility.level, Eq(Visibility::Level::kPublic));



  Attribute* attr = test::GetValue<Attribute>(&table_, "attr/bar");

  ASSERT_THAT(attr, NotNull());

  EXPECT_TRUE(attr->IsWeak());

  ASSERT_THAT(attr, IsNull());



  attr = test::GetValue<Attribute>(&table_, "attr/bat");

  ASSERT_THAT(attr, NotNull());