summaryrefslogtreecommitdiffstats
path: root/camera2
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2014-09-22 23:08:42 -0700
committerAlan Newberger <alann@google.com>2014-09-22 23:08:42 -0700
commit1bd78b36e275371eff1ec1d07c9c1f93f63f5c39 (patch)
treed0dc7cc9b3f19312c3e751278c282528f33d3212 /camera2
parent06b23bb5cbddfed587a6f0d75636734862b49a1e (diff)
downloadandroid_frameworks_ex-1bd78b36e275371eff1ec1d07c9c1f93f63f5c39.tar.gz
android_frameworks_ex-1bd78b36e275371eff1ec1d07c9c1f93f63f5c39.tar.bz2
android_frameworks_ex-1bd78b36e275371eff1ec1d07c9c1f93f63f5c39.zip
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
Diffstat (limited to 'camera2')
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java7
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("-", "_");
}
/**