summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-06 11:22:29 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-09-06 11:22:29 -0700
commitbf3e62b8913fc2fb88d6bb454a6491424cbd40c5 (patch)
tree0a46d19eab409ad56c727cb8dae4190a125b937f
parentbb60bc26020f3aabc50aa93ad9bf812af7f48f9c (diff)
parent7314532349e402315af9b8f664432dd18292421f (diff)
downloadframeworks_base-bf3e62b8913fc2fb88d6bb454a6491424cbd40c5.zip
frameworks_base-bf3e62b8913fc2fb88d6bb454a6491424cbd40c5.tar.gz
frameworks_base-bf3e62b8913fc2fb88d6bb454a6491424cbd40c5.tar.bz2
Merge "Make SimpleSessionDescription locale safe"
-rw-r--r--voip/java/android/net/sip/SimpleSessionDescription.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/voip/java/android/net/sip/SimpleSessionDescription.java b/voip/java/android/net/sip/SimpleSessionDescription.java
index 29166dc..9fcd21d 100644
--- a/voip/java/android/net/sip/SimpleSessionDescription.java
+++ b/voip/java/android/net/sip/SimpleSessionDescription.java
@@ -18,6 +18,7 @@ package android.net.sip;
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 class SimpleSessionDescription {
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");