From 5dce5e67dbdcd14882edf3f64fba671c77577ee4 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Wed, 10 Dec 2014 10:47:53 -0800 Subject: Fix issue where non-resource attributes would cause obtainStyleAttributes to fail A sentinal value of 0x00000000 was used to mark the first time an AttributeFinder was used. If the resource ID of an attribute was also 0x00000000 (which occurs with non-resource attributes, like 'style'), then it would be mistaken as the sentinel start value. Bug:18421787 Change-Id: I4be353e0f8c940cb6f262d155129f048dcc444ae --- libs/androidfw/tests/AttributeFinder_test.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'libs/androidfw') diff --git a/libs/androidfw/tests/AttributeFinder_test.cpp b/libs/androidfw/tests/AttributeFinder_test.cpp index 664709c..5054624 100644 --- a/libs/androidfw/tests/AttributeFinder_test.cpp +++ b/libs/androidfw/tests/AttributeFinder_test.cpp @@ -50,6 +50,10 @@ static const uint32_t packageUnsortedAttributes[] = { 0x01010002, 0x01010004, 0x7f010001 }; +static const uint32_t singlePackageAttributes[] = { + 0x7f010007, 0x7f01000a, 0x7f01000d, 0x00000000 +}; + TEST(AttributeFinderTest, IteratesSequentially) { const int end = sizeof(sortedAttributes) / sizeof(*sortedAttributes); MockAttributeFinder finder(sortedAttributes, end); @@ -109,3 +113,16 @@ TEST(AttributeFinderTest, FindAttributesInPackageUnsortedAttributeList) { EXPECT_EQ(1, finder.find(0x02010010)); EXPECT_EQ(6, finder.find(0x7f010001)); } + +TEST(AttributeFinderTest, FindAttributesInSinglePackageAttributeList) { + const int end = sizeof(singlePackageAttributes) / sizeof(*singlePackageAttributes); + MockAttributeFinder finder(singlePackageAttributes, end); + + EXPECT_EQ(end, finder.find(0x010100f4)); + EXPECT_EQ(end, finder.find(0x010100f5)); + EXPECT_EQ(end, finder.find(0x010100f6)); + EXPECT_EQ(end, finder.find(0x010100f7)); + EXPECT_EQ(end, finder.find(0x010100f8)); + EXPECT_EQ(end, finder.find(0x010100fa)); + EXPECT_EQ(0, finder.find(0x7f010007)); +} -- cgit v1.1