summaryrefslogtreecommitdiffstats
path: root/voip
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-06 11:51:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 11:51:53 -0700
commitfb3ec448f1208d75edebff0e93fa97a8913ff29e (patch)
treec93c0101d6c73c8cdb9e8bcf164a3182c092e4db /voip
parent49a7387418c24f03d9248e0cbc12c59d8516ba83 (diff)
parentf66603e109d439e3a537cd3804706609ce86970e (diff)
downloadframeworks_base-fb3ec448f1208d75edebff0e93fa97a8913ff29e.zip
frameworks_base-fb3ec448f1208d75edebff0e93fa97a8913ff29e.tar.gz
frameworks_base-fb3ec448f1208d75edebff0e93fa97a8913ff29e.tar.bz2
am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
* commit 'f66603e109d439e3a537cd3804706609ce86970e': Make SimpleSessionDescription locale safe
Diffstat (limited to 'voip')
-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");