diff options
| author | 2012-11-30 12:45:30 -0800 | |
|---|---|---|
| committer | 2012-11-30 12:45:30 -0800 | |
| commit | 9813e365e55a59348d12e36e08902899c3f05eb0 (patch) | |
| tree | 687d63b2a2789e7a3de6f41b3c722ebc4ecae5c8 | |
| parent | 1b3a4362a08d816d78fdbb04ef115b31c8674420 (diff) | |
| parent | 940ad4aaef6ad27a2a214559100a18100b2b3b24 (diff) | |
am 940ad4aa: Merge "Make AudioGroup.add locale safe"
* commit '940ad4aaef6ad27a2a214559100a18100b2b3b24':
Make AudioGroup.add locale safe
| -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 8c190621934f..8faeb88db6e9 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(), |