diff options
| author | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 15:33:13 +0000 |
|---|---|---|
| committer | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 15:33:13 +0000 |
| commit | f937f4df3a8bf73766aa2dd784e422ca73ea2fe0 (patch) | |
| tree | 7f1468e1341ceee558b2dae4198ce4d43d4f6c19 | |
| parent | 29343ec0ee0140a7cc4d95290e5ab74025cdba78 (diff) | |
| download | chromium_src-f937f4df3a8bf73766aa2dd784e422ca73ea2fe0.zip chromium_src-f937f4df3a8bf73766aa2dd784e422ca73ea2fe0.tar.gz chromium_src-f937f4df3a8bf73766aa2dd784e422ca73ea2fe0.tar.bz2 | |
Fix several usages of the default locale in Java code.
BUG=316522
NOTRY=true
Review URL: https://codereview.chromium.org/187023003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255043 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java | 3 | ||||
| -rw-r--r-- | remoting/android/java/src/org/chromium/chromoting/HostListLoader.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java index c0e193f..40e88ba 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java @@ -15,6 +15,7 @@ import org.chromium.android_webview.AwSettings; import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.Feature; +import java.util.Locale; import java.util.concurrent.Callable; /** @@ -35,7 +36,7 @@ public class AwZoomTest extends AwTestBase { private String getZoomableHtml(float scale) { final int divWidthPercent = (int)(100.0f / scale); - return String.format("<html><head><meta name=\"viewport\" content=\"" + + return String.format(Locale.US, "<html><head><meta name=\"viewport\" content=\"" + "width=device-width, minimum-scale=%f, maximum-scale=2.0, initial-scale=%f" + "\"/></head><body style='margin:0'>" + "<div style='width:%d%%;height:100px;border:1px solid black'>Zoomable</div>" + diff --git a/remoting/android/java/src/org/chromium/chromoting/HostListLoader.java b/remoting/android/java/src/org/chromium/chromoting/HostListLoader.java index b9d1c54..59800a8 100644 --- a/remoting/android/java/src/org/chromium/chromoting/HostListLoader.java +++ b/remoting/android/java/src/org/chromium/chromoting/HostListLoader.java @@ -21,6 +21,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Locale; import java.util.Scanner; /** Helper for fetching the host list. */ @@ -183,12 +184,13 @@ public class HostListLoader { private static void sortHosts(ArrayList<HostInfo> hosts) { Comparator<HostInfo> hostComparator = new Comparator<HostInfo>() { + @Override public int compare(HostInfo a, HostInfo b) { if (a.isOnline != b.isOnline) { return a.isOnline ? -1 : 1; } - String aName = a.name.toUpperCase(); - String bName = b.name.toUpperCase(); + String aName = a.name.toUpperCase(Locale.getDefault()); + String bName = b.name.toUpperCase(Locale.getDefault()); return aName.compareTo(bName); } }; |