commit 037b93af1719bd35ebf08cdfc2b6691b61a29f88
author sakal <sakal@webrtc.org> Mon Jan 16 12:57:32 2017
committer Commit bot <commit-bot@chromium.org> Mon Jan 16 12:57:32 2017
tree ccc4d5684544c8810eeb6e3226f41699e326175c
parent 6deecb2a2f66312dfaf49e57e33c60c5e36cb7e4

Replace default locale with US locale on Android.

This fixes a lint warning and also fixes potential bugs on devices
running locales where toLowerCase and toUpperCase don't behave
as expected.

BUG=webrtc:6597
R=magjed@webrtc.org
TBR=kjellander@webrtc.org

Review-Url: https://codereview.webrtc.org/2624423003
Cr-Commit-Position: refs/heads/master@{#16092}

webrtc/build/android/suppressions.xml

diff --git a/webrtc/build/android/suppressions.xml b/webrtc/build/android/suppressions.xml
index d48ccb3..b8b9987 100644
--- a/webrtc/build/android/suppressions.xml
+++ b/webrtc/build/android/suppressions.xml
@@ -8,7 +8,6 @@
   <issue id="NewApi"></issue>
 
   <issue id="InlinedApi" severity="ignore"/>
-  <issue id="DefaultLocale" severity="ignore"/>
   <issue id="Assert" severity="ignore"/>
   <issue id="UseSparseArrays" severity="ignore"/>
 

webrtc/sdk/android/api/org/webrtc/EglRenderer.java

diff --git a/webrtc/sdk/android/api/org/webrtc/EglRenderer.java b/webrtc/sdk/android/api/org/webrtc/EglRenderer.java
index 284a1b1..f05f6bc 100644
--- a/webrtc/sdk/android/api/org/webrtc/EglRenderer.java
+++ b/webrtc/sdk/android/api/org/webrtc/EglRenderer.java
@@ -20,6 +20,7 @@
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -678,7 +679,7 @@
           + " Frames received: " + framesReceived + "."
           + " Dropped: " + framesDropped + "."
           + " Rendered: " + framesRendered + "."
-          + " Render fps: " + String.format("%.1f", renderFps) + "."
+          + " Render fps: " + String.format(Locale.US, "%.1f", renderFps) + "."
           + " Average render time: " + averageTimeAsString(renderTimeNs, framesRendered) + "."
           + " Average swapBuffer time: "
           + averageTimeAsString(renderSwapBufferTimeNs, framesRendered) + ".");

webrtc/sdk/android/api/org/webrtc/SessionDescription.java

diff --git a/webrtc/sdk/android/api/org/webrtc/SessionDescription.java b/webrtc/sdk/android/api/org/webrtc/SessionDescription.java
index 3236fe8..7367085 100644
--- a/webrtc/sdk/android/api/org/webrtc/SessionDescription.java
+++ b/webrtc/sdk/android/api/org/webrtc/SessionDescription.java
@@ -10,6 +10,8 @@
 
 package org.webrtc;
 
+import java.util.Locale;
+
 /**
  * Description of an RFC 4566 Session.
  * SDPs are passed as serialized Strings in Java-land and are materialized
@@ -23,11 +25,11 @@
     ANSWER;
 
     public String canonicalForm() {
-      return name().toLowerCase();
+      return name().toLowerCase(Locale.US);
     }
 
     public static Type fromCanonicalForm(String canonical) {
-      return Type.valueOf(Type.class, canonical.toUpperCase());
+      return Type.valueOf(Type.class, canonical.toUpperCase(Locale.US));
     }
   }