From 1d65c95fe8284c7b97823c4a719505d773fcea55 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 20 Dec 2017 12:36:31 -0800 Subject: [PATCH] StartsWith allows a std::string prefix now. Bug: N/A Test: builds Change-Id: I5183ec8133f5dc9a81a438223c6d3d2ea11ef0ec --- minui/resources.cpp | 2 +- tests/manual/recovery_test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minui/resources.cpp b/minui/resources.cpp index 837f5ebc..52ab60b1 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -397,7 +397,7 @@ bool matches_locale(const std::string& prefix, const std::string& locale) { // match the locale string without the {script} section. // For instance, prefix == "en" matches locale == "en-US", prefix == "sr-Latn" matches locale // == "sr-Latn-BA", and prefix == "zh-CN" matches locale == "zh-Hans-CN". - if (android::base::StartsWith(locale, prefix.c_str())) { + if (android::base::StartsWith(locale, prefix)) { return true; } diff --git a/tests/manual/recovery_test.cpp b/tests/manual/recovery_test.cpp index 92c6ef2d..64e3b59e 100644 --- a/tests/manual/recovery_test.cpp +++ b/tests/manual/recovery_test.cpp @@ -209,7 +209,7 @@ TEST_P(ResourceTest, ValidateLocale) { ASSERT_GT(height, y + 1 + h) << "Locale: " << kLocale << " is not found in the file."; char* loc = reinterpret_cast(&row[5]); if (matches_locale(loc, kLocale.c_str())) { - EXPECT_TRUE(android::base::StartsWith(loc, kLocale.c_str())); + EXPECT_TRUE(android::base::StartsWith(loc, kLocale)); break; } else { for (int i = 0; i < h; ++i, ++y) {