diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java index 065528ff5c..f80525bdf6 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java @@ -2835,6 +2835,7 @@ public final class Util { "ji", "yi", // Individual macrolanguage codes mapped back to full macrolanguage code. // See https://en.wikipedia.org/wiki/ISO_639_macrolanguage + "arb", "ar-arb", "in", "ms-ind", "ind", "ms-ind", "nb", "no-nob", diff --git a/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java b/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java index db2900fa2a..1db8dca85a 100644 --- a/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java +++ b/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java @@ -1162,6 +1162,7 @@ public class UtilTest { assertThat(Util.normalizeLanguageCode("ara-ayl")).isEqualTo("ar-ayl"); // Special case of short codes that are actually part of a macrolanguage. + assertThat(Util.normalizeLanguageCode("arb")).isEqualTo("ar-arb"); assertThat(Util.normalizeLanguageCode("nb")).isEqualTo("no-nob"); assertThat(Util.normalizeLanguageCode("nn")).isEqualTo("no-nno"); assertThat(Util.normalizeLanguageCode("nob")).isEqualTo("no-nob");