diff options
author | Alan Newberger <alann@google.com> | 2014-09-23 19:32:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-23 19:32:16 +0000 |
commit | 2eed7ab0e5d81c0025737c6ce9931f3d8b57b418 (patch) | |
tree | 3fa39cf2382112a3a67922ba9f93bd018ea02623 /camera2 | |
parent | bad9708bd92213e65bfc9761ce3e69f8a59e1483 (diff) | |
parent | 1bd78b36e275371eff1ec1d07c9c1f93f63f5c39 (diff) | |
download | android_frameworks_ex-2eed7ab0e5d81c0025737c6ce9931f3d8b57b418.tar.gz android_frameworks_ex-2eed7ab0e5d81c0025737c6ce9931f3d8b57b418.tar.bz2 android_frameworks_ex-2eed7ab0e5d81c0025737c6ce9931f3d8b57b418.zip |
Merge "Specify Locale.US for stringification of enums" into lmp-dev
Diffstat (limited to 'camera2')
-rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java | 7 |
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("-", "_"); } /** |