diff options
| author | Elliott Hughes <enh@google.com> | 2012-11-30 12:56:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 12:56:01 -0800 |
| commit | 17745436aa6d76765791f3c877360399b6a95487 (patch) | |
| tree | 4ed62fdfd2c85af14578bfcc098be84043053eb9 | |
| parent | 86d1860a1d9c905bf8ee8328bcee4537cd02fcd6 (diff) | |
| parent | fe2164c76a5715e0a8106aacfd78a372d510bc04 (diff) | |
| download | voip-17745436aa6d76765791f3c877360399b6a95487.tar.gz | |
am 9813e365: am 940ad4aa: Merge "Make AudioGroup.add locale safe"
* commit '9813e365e55a59348d12e36e08902899c3f05eb0':
Make AudioGroup.add locale safe
| -rw-r--r-- | java/android/net/rtp/AudioGroup.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/android/net/rtp/AudioGroup.java b/java/android/net/rtp/AudioGroup.java index 8c19062..8faeb88 100644 --- a/java/android/net/rtp/AudioGroup.java +++ b/java/android/net/rtp/AudioGroup.java @@ -19,6 +19,7 @@ package android.net.rtp; import android.media.AudioManager; import java.util.HashMap; +import java.util.Locale; import java.util.Map; /** @@ -146,7 +147,7 @@ public class AudioGroup { if (!mStreams.containsKey(stream)) { try { AudioCodec codec = stream.getCodec(); - String codecSpec = String.format("%d %s %s", codec.type, + String codecSpec = String.format(Locale.US, "%d %s %s", codec.type, codec.rtpmap, codec.fmtp); int id = nativeAdd(stream.getMode(), stream.getSocket(), stream.getRemoteAddress().getHostAddress(), |