From 68cd283830ff775cadc77f2abebc561ddae7ed65 Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Tue, 14 Jul 2020 08:12:53 +0100
Subject: [PATCH] Remove occurrences of grandfathering

ISSUE: #7565
PiperOrigin-RevId: 321108417
---
 .../com/google/android/exoplayer2/util/Util.java | 16 ++++++++--------
 .../google/android/exoplayer2/util/UtilTest.java |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
index cc43241757..afb97eb557 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -585,7 +585,7 @@ public final class Util {
       mainLanguage = replacedLanguage;
     }
     if ("no".equals(mainLanguage) || "i".equals(mainLanguage) || "zh".equals(mainLanguage)) {
-      normalizedTag = maybeReplaceGrandfatheredLanguageTags(normalizedTag);
+      normalizedTag = maybeReplaceLegacyLanguageTags(normalizedTag);
     }
     return normalizedTag;
   }
@@ -2347,11 +2347,11 @@ public final class Util {
             .isCleartextTrafficPermitted(checkNotNull(uri.getHost()));
   }
 
-  private static String maybeReplaceGrandfatheredLanguageTags(String languageTag) {
-    for (int i = 0; i < isoGrandfatheredTagReplacements.length; i += 2) {
-      if (languageTag.startsWith(isoGrandfatheredTagReplacements[i])) {
-        return isoGrandfatheredTagReplacements[i + 1]
-            + languageTag.substring(/* beginIndex= */ isoGrandfatheredTagReplacements[i].length());
+  private static String maybeReplaceLegacyLanguageTags(String languageTag) {
+    for (int i = 0; i < isoLegacyTagReplacements.length; i += 2) {
+      if (languageTag.startsWith(isoLegacyTagReplacements[i])) {
+        return isoLegacyTagReplacements[i + 1]
+            + languageTag.substring(/* beginIndex= */ isoLegacyTagReplacements[i].length());
       }
     }
     return languageTag;
@@ -2411,9 +2411,9 @@ public final class Util {
         "hsn", "zh-hsn"
       };
 
-  // "Grandfathered tags", replaced by modern equivalents (including macrolanguage)
+  // Legacy ("grandfathered") tags, replaced by modern equivalents (including macrolanguage)
   // See https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry.
-  private static final String[] isoGrandfatheredTagReplacements =
+  private static final String[] isoLegacyTagReplacements =
       new String[] {
         "i-lux", "lb",
         "i-hak", "zh-hak",
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
index de51274697..d3294997da 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
@@ -940,7 +940,7 @@ public class UtilTest {
     assertThat(Util.normalizeLanguageCode("ji")).isEqualTo(Util.normalizeLanguageCode("yi"));
     assertThat(Util.normalizeLanguageCode("ji")).isEqualTo(Util.normalizeLanguageCode("yid"));
 
-    // Grandfathered tags
+    // Legacy tags
     assertThat(Util.normalizeLanguageCode("i-lux")).isEqualTo(Util.normalizeLanguageCode("lb"));
     assertThat(Util.normalizeLanguageCode("i-lux")).isEqualTo(Util.normalizeLanguageCode("ltz"));
     assertThat(Util.normalizeLanguageCode("i-hak")).isEqualTo(Util.normalizeLanguageCode("hak"));