Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d1ecec authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 9813e365: am 940ad4aa: Merge "Make AudioGroup.add locale safe" 

* commit '9813e365':
  Make AudioGroup.add locale safe
parents d5dcb6d4 9813e365

voip/java/android/net/rtp/AudioGroup.java

+2 −1
Original line number Diff line number Diff line
@@ -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(),