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 | c1d1ececd83104c3de889928175b9f4fdcbbb131 (patch) | |
| tree | 672d47a89ddd54d56d338dc218018180b70f771c /voip | |
| parent | d5dcb6d4e9ffcaf5d74b89a3bcd5f2dab6d09f9f (diff) | |
| parent | 9813e365e55a59348d12e36e08902899c3f05eb0 (diff) | |
| download | frameworks_base-c1d1ececd83104c3de889928175b9f4fdcbbb131.zip frameworks_base-c1d1ececd83104c3de889928175b9f4fdcbbb131.tar.gz frameworks_base-c1d1ececd83104c3de889928175b9f4fdcbbb131.tar.bz2 | |
am 9813e365: am 940ad4aa: Merge "Make AudioGroup.add locale safe"
* commit '9813e365e55a59348d12e36e08902899c3f05eb0':
Make AudioGroup.add locale safe
Diffstat (limited to 'voip')
| -rw-r--r-- | voip/java/android/net/rtp/AudioGroup.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/voip/java/android/net/rtp/AudioGroup.java b/voip/java/android/net/rtp/AudioGroup.java index 8c19062..8faeb88 100644 --- a/voip/java/android/net/rtp/AudioGroup.java +++ b/voip/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(), |