From a7d1d73a477fe512d9ea69ee2883084630ec24c4 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Wed, 1 Oct 2014 18:24:54 -0700 Subject: Implement back-tracking when searching for attributes in XML or resource bag Shared libraries have their package ID assigned at run-time, so some of the guarantees we used to have about sort order of attributes in bags or XML elements no longer hold. This CL adds back-tracking and can jump to the nearest attribute with the same package ID and continue searching. This means that attributes with the same package ID must be sorted by increasing resource ID, as was the case before. Attributes with the same package ID must be grouped together, but the groups can be in any order. Ex: 0x02010001, 0x02010002, 0x01010000, 0x01010010, 0x7f010032 Bug:17666947 Change-Id: I9c198bbb6ca788849aac85b6323606ea5d9550d6 --- libs/androidfw/ResourceTypes.cpp | 10 ++- libs/androidfw/tests/Android.mk | 1 + libs/androidfw/tests/AttributeFinder_test.cpp | 111 ++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 libs/androidfw/tests/AttributeFinder_test.cpp (limited to 'libs/androidfw') diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index f1e4858..420fe38 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -1185,7 +1185,11 @@ uint32_t ResXMLParser::getAttributeNameResID(size_t idx) const { int32_t id = getAttributeNameID(idx); if (id >= 0 && (size_t)id < mTree.mNumResIds) { - return dtohl(mTree.mResIds[id]); + uint32_t resId = dtohl(mTree.mResIds[id]); + if (mTree.mDynamicRefTable != NULL) { + mTree.mDynamicRefTable->lookupResourceId(&resId); + } + return resId; } return 0; } @@ -5973,11 +5977,11 @@ status_t DynamicRefTable::lookupResourceId(uint32_t* resId) const { // Do a proper lookup. uint8_t translatedId = mLookupTable[packageId]; if (translatedId == 0) { - ALOGE("DynamicRefTable(0x%02x): No mapping for build-time package ID 0x%02x.", + ALOGV("DynamicRefTable(0x%02x): No mapping for build-time package ID 0x%02x.", (uint8_t)mAssignedPackageId, (uint8_t)packageId); for (size_t i = 0; i < 256; i++) { if (mLookupTable[i] != 0) { - ALOGE("e[0x%02x] -> 0x%02x", (uint8_t)i, mLookupTable[i]); + ALOGV("e[0x%02x] -> 0x%02x", (uint8_t)i, mLookupTable[i]); } } return UNKNOWN_ERROR; diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index 2d7906f..c1014be 100644 --- a/libs/androidfw/tests/Android.mk +++ b/libs/androidfw/tests/Android.mk @@ -20,6 +20,7 @@ # ========================================================== LOCAL_PATH:= $(call my-dir) testFiles := \ + AttributeFinder_test.cpp \ ByteBucketArray_test.cpp \ Config_test.cpp \ ConfigLocale_test.cpp \ diff --git a/libs/androidfw/tests/AttributeFinder_test.cpp b/libs/androidfw/tests/AttributeFinder_test.cpp new file mode 100644 index 0000000..664709c --- /dev/null +++ b/libs/androidfw/tests/AttributeFinder_test.cpp @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#include + +using android::BackTrackingAttributeFinder; + +class MockAttributeFinder : public BackTrackingAttributeFinder { +public: + MockAttributeFinder(const uint32_t* attrs, int len) + : BackTrackingAttributeFinder(0, len) { + mAttrs = new uint32_t[len]; + memcpy(mAttrs, attrs, sizeof(*attrs) * len); + } + + ~MockAttributeFinder() { + delete mAttrs; + } + + inline uint32_t getAttribute(const int index) const { + return mAttrs[index]; + } + +private: + uint32_t* mAttrs; +}; + +static const uint32_t sortedAttributes[] = { + 0x01010000, 0x01010001, 0x01010002, 0x01010004, + 0x02010001, 0x02010010, 0x7f010001 +}; + +static const uint32_t packageUnsortedAttributes[] = { + 0x02010001, 0x02010010, 0x01010000, 0x01010001, + 0x01010002, 0x01010004, 0x7f010001 +}; + +TEST(AttributeFinderTest, IteratesSequentially) { + const int end = sizeof(sortedAttributes) / sizeof(*sortedAttributes); + MockAttributeFinder finder(sortedAttributes, end); + + EXPECT_EQ(0, finder.find(0x01010000)); + EXPECT_EQ(1, finder.find(0x01010001)); + EXPECT_EQ(2, finder.find(0x01010002)); + EXPECT_EQ(3, finder.find(0x01010004)); + EXPECT_EQ(4, finder.find(0x02010001)); + EXPECT_EQ(5, finder.find(0x02010010)); + EXPECT_EQ(6, finder.find(0x7f010001)); + EXPECT_EQ(end, finder.find(0x7f010002)); +} + +TEST(AttributeFinderTest, PackagesAreOutOfOrder) { + const int end = sizeof(sortedAttributes) / sizeof(*sortedAttributes); + MockAttributeFinder finder(sortedAttributes, end); + + EXPECT_EQ(6, finder.find(0x7f010001)); + EXPECT_EQ(end, finder.find(0x7f010002)); + EXPECT_EQ(4, finder.find(0x02010001)); + EXPECT_EQ(5, finder.find(0x02010010)); + EXPECT_EQ(0, finder.find(0x01010000)); + EXPECT_EQ(1, finder.find(0x01010001)); + EXPECT_EQ(2, finder.find(0x01010002)); + EXPECT_EQ(3, finder.find(0x01010004)); +} + +TEST(AttributeFinderTest, SomeAttributesAreNotFound) { + const int end = sizeof(sortedAttributes) / sizeof(*sortedAttributes); + MockAttributeFinder finder(sortedAttributes, end); + + EXPECT_EQ(0, finder.find(0x01010000)); + EXPECT_EQ(1, finder.find(0x01010001)); + EXPECT_EQ(2, finder.find(0x01010002)); + EXPECT_EQ(end, finder.find(0x01010003)); + EXPECT_EQ(3, finder.find(0x01010004)); + EXPECT_EQ(end, finder.find(0x01010005)); + EXPECT_EQ(end, finder.find(0x01010006)); + EXPECT_EQ(4, finder.find(0x02010001)); + EXPECT_EQ(end, finder.find(0x02010002)); +} + +TEST(AttributeFinderTest, FindAttributesInPackageUnsortedAttributeList) { + const int end = sizeof(packageUnsortedAttributes) / sizeof(*packageUnsortedAttributes); + MockAttributeFinder finder(packageUnsortedAttributes, end); + + EXPECT_EQ(2, finder.find(0x01010000)); + EXPECT_EQ(3, finder.find(0x01010001)); + EXPECT_EQ(4, finder.find(0x01010002)); + EXPECT_EQ(end, finder.find(0x01010003)); + EXPECT_EQ(5, finder.find(0x01010004)); + EXPECT_EQ(end, finder.find(0x01010005)); + EXPECT_EQ(end, finder.find(0x01010006)); + EXPECT_EQ(0, finder.find(0x02010001)); + EXPECT_EQ(end, finder.find(0x02010002)); + EXPECT_EQ(1, finder.find(0x02010010)); + EXPECT_EQ(6, finder.find(0x7f010001)); +} -- cgit v1.1