diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/UrlTemplate.java b/library/src/main/java/com/google/android/exoplayer/dash/mpd/UrlTemplate.java index c055b460b2..1439ee6ec6 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/UrlTemplate.java +++ b/library/src/main/java/com/google/android/exoplayer/dash/mpd/UrlTemplate.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer.dash.mpd; +import java.util.Locale; + /** * A template from which URLs can be built. *
@@ -85,11 +87,11 @@ public final class UrlTemplate { if (identifiers[i] == REPRESENTATION_ID) { builder.append(representationId); } else if (identifiers[i] == NUMBER_ID) { - builder.append(String.format(identifierFormatTags[i], segmentNumber)); + builder.append(String.format(Locale.US, identifierFormatTags[i], segmentNumber)); } else if (identifiers[i] == BANDWIDTH_ID) { - builder.append(String.format(identifierFormatTags[i], bandwidth)); + builder.append(String.format(Locale.US, identifierFormatTags[i], bandwidth)); } else if (identifiers[i] == TIME_ID) { - builder.append(String.format(identifierFormatTags[i], time)); + builder.append(String.format(Locale.US, identifierFormatTags[i], time)); } } builder.append(urlPieces[identifierCount]); diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsParserUtil.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsParserUtil.java index 2ddfdd081b..23a64163ad 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsParserUtil.java +++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsParserUtil.java @@ -36,7 +36,7 @@ import java.util.regex.Pattern; if (matcher.find() && matcher.groupCount() == 1) { return matcher.group(1); } - throw new ParserException(String.format("Couldn't match %s tag in %s", tag, line)); + throw new ParserException("Couldn't match " + tag + " tag in " + line); } public static int parseIntAttr(String line, Pattern pattern, String tag) diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/Id3Parser.java b/library/src/main/java/com/google/android/exoplayer/metadata/Id3Parser.java index d2443d7d74..f306c5d6e8 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/Id3Parser.java +++ b/library/src/main/java/com/google/android/exoplayer/metadata/Id3Parser.java @@ -22,6 +22,7 @@ import com.google.android.exoplayer.util.ParsableByteArray; import java.io.UnsupportedEncodingException; import java.util.Collections; import java.util.HashMap; +import java.util.Locale; import java.util.Map; /** @@ -108,7 +109,7 @@ public class Id3Parser implements MetadataParser