commit 18d523fa3e2b6bdc341d3cb9042092ff2c0d9ad2
author Jean-Baptiste Queru <jbq@google.com> Thu Sep 06 11:51:53 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 06 11:51:53 2012 -0700
tree 2e5cb4c26121ba2658ab62fe4cf6bdbe4263dbe2
parent f29ac10f0f3649c16a6e44bac961401cd3874fd4
parent 0226eb00cecf82b53e29758c04cd1b39015d2909

am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

* commit 'f66603e109d439e3a537cd3804706609ce86970e':
  Make SimpleSessionDescription locale safe

java/android/net/sip/SimpleSessionDescription.java

diff --git a/java/android/net/sip/SimpleSessionDescription.java b/java/android/net/sip/SimpleSessionDescription.java
index 29166dc..9fcd21d 100644
--- a/java/android/net/sip/SimpleSessionDescription.java
+++ b/java/android/net/sip/SimpleSessionDescription.java
@@ -18,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Locale;
 
 /**
  * An object used to manipulate messages of Session Description Protocol (SDP).
@@ -66,7 +67,7 @@
     public SimpleSessionDescription(long sessionId, String address) {
         address = (address.indexOf(':') < 0 ? "IN IP4 " : "IN IP6 ") + address;
         mFields.parse("v=0");
-        mFields.parse(String.format("o=- %d %d %s", sessionId,
+        mFields.parse(String.format(Locale.US, "o=- %d %d %s", sessionId,
                 System.currentTimeMillis(), address));
         mFields.parse("s=-");
         mFields.parse("t=0 0");