commit 92be1378f9998ab108e2c4f8de6d53d3481f7586
author Elliott Hughes <enh@google.com> Thu Dec 21 09:34:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 21 09:34:32 2017 +0000
tree dcfd608f2640dc9ee36abf25c948a58a0ea22459
parent 50a4171030d3b7df6a6925f5da0b463d7f1420eb
parent bd870377b47284ce2aeee1ec094f1fd33a6955d5

Merge "StartsWith allows a std::string prefix now." am: 80ccac2fff
am: bd870377b4

Change-Id: I720e3ba91146cbbf783eb3ef4b8347f16c52ec05

minui/resources.cpp

diff --git a/minui/resources.cpp b/minui/resources.cpp
index 837f5eb..52ab60b 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -397,7 +397,7 @@
   // 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;
   }
 

tests/manual/recovery_test.cpp

diff --git a/tests/manual/recovery_test.cpp b/tests/manual/recovery_test.cpp
index 92c6ef2..64e3b59 100644
--- a/tests/manual/recovery_test.cpp
+++ b/tests/manual/recovery_test.cpp
@@ -209,7 +209,7 @@
     ASSERT_GT(height, y + 1 + h) << "Locale: " << kLocale << " is not found in the file.";
     char* loc = reinterpret_cast<char*>(&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) {