diff --git a/libraries/common/src/main/java/androidx/media3/common/Format.java b/libraries/common/src/main/java/androidx/media3/common/Format.java index e54ec79246..3db7583314 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Format.java +++ b/libraries/common/src/main/java/androidx/media3/common/Format.java @@ -953,10 +953,11 @@ public final class Format implements Bundleable { language = Util.normalizeLanguageCode(builder.language); @Nullable String tmpLabel = builder.label; labels = builder.labels == null ? new ArrayList<>() : builder.labels; - if (labels.isEmpty() && tmpLabel != null && !tmpLabel.isEmpty()) { + if (labels.isEmpty() && !TextUtils.isEmpty(tmpLabel)) { labels.add(new Label(language, tmpLabel)); } label = makeLabelIfNeeded(tmpLabel, labels); + checkLabels(label, labels); selectionFlags = builder.selectionFlags; roleFlags = builder.roleFlags; averageBitrate = builder.averageBitrate; @@ -1005,7 +1006,7 @@ public final class Format implements Bundleable { } private @Nullable String makeLabelIfNeeded(@Nullable String label, List