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

Commit 8ea8db8b authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Use String8/16 c_str [idmap2, androidfw]" into aosp-main-future

parents daa96bca 0b4ead79

cmds/idmap2/libidmap2/RawPrintVisitor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void RawPrintVisitor::visit(const IdmapData& data ATTRIBUTE_UNUSED) { 
      auto value = target_entry_value.second;



      print(target_entry_value.first.to_string(), false, "config: %s",

          target_entry_value.first.toString().string());

          target_entry_value.first.toString().c_str());



      print(value.data_type, "type: %s",

            utils::DataTypeToString(value.data_type).data());

libs/androidfw/tests/ConfigDescription_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -159,17 +159,17 @@ TEST(ConfigDescriptionTest, TestGrammaticalGenderQualifier) { 
  EXPECT_TRUE(TestParse("feminine", &config));

  EXPECT_EQ(android::ResTable_config::GRAMMATICAL_GENDER_FEMININE, config.grammaticalInflection);

  EXPECT_EQ(SDK_U, config.sdkVersion);

  EXPECT_EQ(std::string("feminine-v34"), config.toString().string());

  EXPECT_EQ(std::string("feminine-v34"), config.toString().c_str());



  EXPECT_TRUE(TestParse("masculine", &config));

  EXPECT_EQ(android::ResTable_config::GRAMMATICAL_GENDER_MASCULINE, config.grammaticalInflection);

  EXPECT_EQ(SDK_U, config.sdkVersion);

  EXPECT_EQ(std::string("masculine-v34"), config.toString().string());

  EXPECT_EQ(std::string("masculine-v34"), config.toString().c_str());



  EXPECT_TRUE(TestParse("neuter", &config));

  EXPECT_EQ(android::ResTable_config::GRAMMATICAL_GENDER_NEUTER, config.grammaticalInflection);

  EXPECT_EQ(SDK_U, config.sdkVersion);

  EXPECT_EQ(std::string("neuter-v34"), config.toString().string());

  EXPECT_EQ(std::string("neuter-v34"), config.toString().c_str());

}



}  // namespace android

libs/androidfw/tests/ResTable_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ TEST_P(ResTableParameterizedTest, ShouldLoadSparseEntriesSuccessfully) { 
  String16 name(u"com.android.sparse:integer/foo_9");

  uint32_t flags;

  uint32_t resid =

      table.identifierForName(name.string(), name.size(), nullptr, 0, nullptr, 0, &flags);

      table.identifierForName(name.c_str(), name.size(), nullptr, 0, nullptr, 0, &flags);

  ASSERT_NE(0u, resid);



  Res_value val;