diff options
Diffstat (limited to 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/tests/ConfigDescription_test.cpp | 6 | ||||
| -rw-r--r-- | libs/androidfw/tests/ResTable_test.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/androidfw/tests/ConfigDescription_test.cpp b/libs/androidfw/tests/ConfigDescription_test.cpp index ec478b0900ef..07bd17568993 100644 --- a/libs/androidfw/tests/ConfigDescription_test.cpp +++ b/libs/androidfw/tests/ConfigDescription_test.cpp @@ -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 diff --git a/libs/androidfw/tests/ResTable_test.cpp b/libs/androidfw/tests/ResTable_test.cpp index 945981b981a0..faac51403203 100644 --- a/libs/androidfw/tests/ResTable_test.cpp +++ b/libs/androidfw/tests/ResTable_test.cpp @@ -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; |