summaryrefslogtreecommitdiffstats
path: root/voip/java/android/net/sip/SimpleSessionDescription.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-06 11:47:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 11:47:29 -0700
commit3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2 (patch)
tree39d3ff93d4d6a3ae80c1f086fa1d34eba2c59ddb /voip/java/android/net/sip/SimpleSessionDescription.java
parent4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858 (diff)
parentbf3e62b8913fc2fb88d6bb454a6491424cbd40c5 (diff)
downloadframeworks_base-3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2.zip
frameworks_base-3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2.tar.gz
frameworks_base-3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2.tar.bz2
am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
* commit 'bf3e62b8913fc2fb88d6bb454a6491424cbd40c5': Make SimpleSessionDescription locale safe
Diffstat (limited to 'voip/java/android/net/sip/SimpleSessionDescription.java')
-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");