From 1bd78b36e275371eff1ec1d07c9c1f93f63f5c39 Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Mon, 22 Sep 2014 23:08:42 -0700 Subject: Specify Locale.US for stringification of enums For machine-readable enum translation, use Locale.US which will preserve english enum casing and is recommended in Locale docs. Bug: 17557568 Change-Id: I40274bccdb593889c8ded003a5fb731f45892d7b --- .../src/com/android/ex/camera2/portability/CameraCapabilities.java | 7 ++++--- 1 file 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("-", "_"); } /** -- cgit v1.2.3