PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "StartsWith allows a std::string prefix now."

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-21 02:11:08 +00:00
committed by Gerrit Code Review
parent 3fe230a1e4 1d65c95fe8
commit 80ccac2fff
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
minui/resources.cpp
View File

@@ -397,7 +397,7 @@ bool matches_locale(const std::string& prefix, const std::string& locale) {
// match the locale string without the {script} section. // match the locale string without the {script} section.
// For instance, prefix == "en" matches locale == "en-US", prefix == "sr-Latn" matches locale // 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". // == "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; return true;
} }

2
tests/manual/recovery_test.cpp
View File

@@ -209,7 +209,7 @@ TEST_P(ResourceTest, ValidateLocale) {
ASSERT_GT(height, y + 1 + h) << "Locale: " << kLocale << " is not found in the file."; ASSERT_GT(height, y + 1 + h) << "Locale: " << kLocale << " is not found in the file.";
char* loc = reinterpret_cast<char*>(&row[5]); char* loc = reinterpret_cast<char*>(&row[5]);
if (matches_locale(loc, kLocale.c_str())) { if (matches_locale(loc, kLocale.c_str())) {
EXPECT_TRUE(android::base::StartsWith(loc, kLocale.c_str())); EXPECT_TRUE(android::base::StartsWith(loc, kLocale));
break; break;
} else { } else {
for (int i = 0; i < h; ++i, ++y) { for (int i = 0; i < h; ++i, ++y) {