am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-dev

* commit '2eed7ab0e5d81c0025737c6ce9931f3d8b57b418':
  Specify Locale.US for stringification of enums

1 files changed, 4 insertions, 3 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
index 60c8cb2..31c47d3 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -323,17 +324,17 @@ public class CameraCapabilities {
          * @return The converted string.
          */
         private static String toApiCase(String enumCase) {
-            return enumCase.toLowerCase().replaceAll("_", "-");
+            return enumCase.toLowerCase(Locale.US).replaceAll("_", "-");
         }
 
         /**
-         * Conerts the string to underscore-delimited uppercase to match the enum constant names.
+         * Converts the string to underscore-delimited uppercase to match the enum constant names.
          *
          * @param apiCase An API-related string representation.
          * @return The converted string.
          */
         private static String toEnumCase(String apiCase) {
-            return apiCase.toUpperCase().replaceAll("-", "_");
+            return apiCase.toUpperCase(Locale.US).replaceAll("-", "_");
         }
 
         /**