Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix resource by name lookup" into pi-dev

Browse Source 
am: 909402935c

Change-Id: I6eadfe944f1f2893deb8f9fc6d72e6e3c7171d5e
This commit is contained in:
Svet Ganov
2018-03-23 19:00:33 +00:00
committed by android-build-merger
parent fcca48b648 909402935c
commit 404231b3bf
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/androidfw/ResourceUtils.cpp
View File

@@ -26,6 +26,9 @@ bool ExtractResourceName(const StringPiece& str, StringPiece* out_package, Strin
bool has_type_separator = false;
const char* start = str.data();
const char* end = start + str.size();
if (start[0] == '@') {
start++;
}
const char* current = start;
while (current != end) {
if (out_type->size() == 0 && *current == '/') {

25
libs/androidfw/tests/ResourceUtils_test.cpp
View File

@@ -27,23 +27,48 @@ TEST(ResourceUtilsTest, ExtractResourceName) {
EXPECT_EQ("string", type);
EXPECT_EQ("foo", entry);
ASSERT_TRUE(ExtractResourceName("@android:string/foo", &package, &type, &entry));
EXPECT_EQ("android", package);
EXPECT_EQ("string", type);
EXPECT_EQ("foo", entry);
ASSERT_TRUE(ExtractResourceName("string/foo", &package, &type, &entry));
EXPECT_EQ("", package);
EXPECT_EQ("string", type);
EXPECT_EQ("foo", entry);
ASSERT_TRUE(ExtractResourceName("@string/foo", &package, &type, &entry));
EXPECT_EQ("", package);
EXPECT_EQ("string", type);
EXPECT_EQ("foo", entry);
ASSERT_TRUE(ExtractResourceName("foo", &package, &type, &entry));
EXPECT_EQ("", package);
EXPECT_EQ("", type);
EXPECT_EQ("foo", entry);
ASSERT_TRUE(ExtractResourceName("@foo", &package, &type, &entry));
EXPECT_EQ("", package);
EXPECT_EQ("", type);
EXPECT_EQ("foo", entry);
ASSERT_TRUE(ExtractResourceName("android:foo", &package, &type, &entry));
EXPECT_EQ("android", package);
EXPECT_EQ("", type);
EXPECT_EQ("foo", entry);
// ASSERT_TRUE(ExtractResourceName("@android:foo", &package, &type, &entry));
// EXPECT_EQ("android", package);
// EXPECT_EQ("", type);
// EXPECT_EQ("foo", entry);
EXPECT_FALSE(ExtractResourceName(":string/foo", &package, &type, &entry));
EXPECT_FALSE(ExtractResourceName("@:string/foo", &package, &type, &entry));
EXPECT_FALSE(ExtractResourceName("/foo", &package, &type, &entry));
EXPECT_FALSE(ExtractResourceName("@/foo", &package, &type, &entry));
}
} // namespace android