Always use en_US for string ops am: 93d233e1ef am: 99a0a81d73

am: fb678adeeb

Change-Id: I5d60de4708f8d4960ad6b5537f21f21917f90a6d

1 files changed, 3 insertions, 2 deletions

diff --git a/JavaGen.cpp b/JavaGen.cpp
index 71d86ca..ba7409d 100644
--- a/JavaGen.cpp
+++ b/JavaGen.cpp
@@ -46,6 +46,7 @@ import android.os.SystemProperties;
 import java.util.ArrayList;
 import java.util.function.Function;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
@@ -54,7 +55,7 @@ import java.util.stream.Collectors;
 
 constexpr const char* kJavaParsersAndFormatters =
     R"(private static Boolean tryParseBoolean(String str) {
-    switch (str.toLowerCase()) {
+    switch (str.toLowerCase(Locale.US)) {
         case "1":
         case "true":
             return Boolean.TRUE;
@@ -96,7 +97,7 @@ private static String tryParseString(String str) {
 
 private static <T extends Enum<T>> T tryParseEnum(Class<T> enumType, String str) {
     try {
-        return Enum.valueOf(enumType, str.toUpperCase());
+        return Enum.valueOf(enumType, str.toUpperCase(Locale.US));
     } catch (IllegalArgumentException e) {
         return null;
     }