drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-10-09 19:02:23 +00:00
committed by Android (Google) Code Review
parent 6166a824b2 e60a87f552
commit aeef612f20
2 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/androidfw/ResourceTypes.cpp
View File

@ -4175,12 +4175,15 @@ nope:
continue; continue;
} }
const ssize_t ti = group->findType16(type, typeLen); const size_t packageCount = group->packages.size();
for (size_t pi = 0; pi < packageCount; pi++) {
ssize_t ti = group->packages[pi]->typeStrings.indexOfString(type, typeLen);
if (ti < 0) { if (ti < 0) {
TABLE_NOISY(printf("Type not found in package %s\n", String8(group->name).string()));
continue; continue;
} }
ti += group->packages[pi]->typeIdOffset;
const TypeList& typeList = group->types[ti]; const TypeList& typeList = group->types[ti];
if (typeList.isEmpty()) { if (typeList.isEmpty()) {
TABLE_NOISY(printf("Expected type structure not found in package %s for index %d\n", TABLE_NOISY(printf("Expected type structure not found in package %s for index %d\n",
@ -4230,6 +4233,7 @@ nope:
} }
} }
} }
}
break; break;
} }
return 0; return 0;

15
libs/androidfw/tests/Split_test.cpp
View File

@ -179,7 +179,7 @@ TEST(SplitFeatureTest, TestNewResourceIsAccessible) {
EXPECT_EQ(Res_value::TYPE_STRING, val.dataType); EXPECT_EQ(Res_value::TYPE_STRING, val.dataType);
} }
TEST(SplitFeatureTest, TestNewResourceIsAccessibleByName) { TEST(SplitFeatureTest, TestNewResourceNameHasCorrectName) {
ResTable table; ResTable table;
ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len)); ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
@ -200,4 +200,17 @@ TEST(SplitFeatureTest, TestNewResourceIsAccessibleByName) {
String16(name.name, name.nameLen)); String16(name.name, name.nameLen));
} }
TEST(SplitFeatureTest, TestNewResourceIsAccessibleByName) {
ResTable table;
ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
ASSERT_EQ(NO_ERROR, table.add(feature_arsc, feature_arsc_len));
const String16 name("test3");
const String16 type("string");
const String16 package("com.android.test.basic");
ASSERT_EQ(base::R::string::test3, table.identifierForName(name.string(), name.size(),
type.string(), type.size(),
package.string(), package.size()));
}
} // namespace } // namespace