From 037b93af1719bd35ebf08cdfc2b6691b61a29f88 Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Mon, 16 Jan 2017 04:57:32 -0800
Subject: [PATCH] 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                     | 1 -
 webrtc/sdk/android/api/org/webrtc/EglRenderer.java        | 3 ++-
 webrtc/sdk/android/api/org/webrtc/SessionDescription.java | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/webrtc/build/android/suppressions.xml b/webrtc/build/android/suppressions.xml
index d48ccb348f..b8b9987a3d 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"/>
 
diff --git a/webrtc/sdk/android/api/org/webrtc/EglRenderer.java b/webrtc/sdk/android/api/org/webrtc/EglRenderer.java
index 284a1b1c08..f05f6bc55e 100644
--- a/webrtc/sdk/android/api/org/webrtc/EglRenderer.java
+++ b/webrtc/sdk/android/api/org/webrtc/EglRenderer.java
@@ -20,6 +20,7 @@ import android.view.Surface;
 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 @@ public class EglRenderer implements VideoRenderer.Callbacks {
           + " 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) + ".");
diff --git a/webrtc/sdk/android/api/org/webrtc/SessionDescription.java b/webrtc/sdk/android/api/org/webrtc/SessionDescription.java
index 3236fe8887..7367085afe 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 @@ public class SessionDescription {
     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));
     }
   }