Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f085422 authored by Svet Ganov's avatar Svet Ganov
Browse files

Fix resource by name lookup 

Test: added: '@' cases to ResourceUtilsTest
      pass: ./out/host/darwin-x86/nativetest/libandroidfw_tests/libandroidfw_tests
      pass: ./out/host/darwin-x86/nativetest/aapt2_tests/aapt2_tests
      pass: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
                -t android.appsecurity.cts.PermissionsHostTest

Bug: 74612500

Change-Id: I144e4ca1b63b9cce71052fc02089bb6092739889
parent c7f6eadf

libs/androidfw/ResourceUtils.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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 == '/') {

libs/androidfw/tests/ResourceUtils_test.cpp

+25 −0
Original line number Diff line number Diff line
@@ -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