am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev

* commit '983b668bd8deb58cbd3faabb931c4fb2dd80bf2f':
  Search all packages for a given type string when looking up resources by name

1 files changed, 14 insertions, 1 deletions

diff --git a/libs/androidfw/tests/Split_test.cpp b/libs/androidfw/tests/Split_test.cpp
index 82703f9..f63f566 100644
--- a/libs/androidfw/tests/Split_test.cpp
+++ b/libs/androidfw/tests/Split_test.cpp
@@ -179,7 +179,7 @@ TEST(SplitFeatureTest, TestNewResourceIsAccessible) {
     EXPECT_EQ(Res_value::TYPE_STRING, val.dataType);
 }
 
-TEST(SplitFeatureTest, TestNewResourceIsAccessibleByName) {
+TEST(SplitFeatureTest, TestNewResourceNameHasCorrectName) {
     ResTable table;
     ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
 
@@ -200,4 +200,17 @@ TEST(SplitFeatureTest, TestNewResourceIsAccessibleByName) {
             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