1 files changed, 8 insertions, 18 deletions
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
index 3da044e603..0a80b02b04 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -27,6 +27,7 @@ import java.util.Locale;
 import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.GeckoSystemStateListener;
 import org.mozilla.gecko.util.GeckoBundle;
+import org.mozilla.gecko.util.LocaleUtils;
 
 @AnyThread
 public final class GeckoRuntimeSettings extends RuntimeSettings {
@@ -462,6 +463,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
      * @param delegate the delegate that will handle telemetry
      * @return The builder instance.
      */
+    @Deprecated
+    @DeprecationSchedule(id = "geckoview-gvst", version = 127)
     public @NonNull Builder telemetryDelegate(final @NonNull RuntimeTelemetry.Delegate delegate) {
       getSettings().mTelemetryProxy = new RuntimeTelemetry.Proxy(delegate);
       getSettings().mTelemetryEnabled.set(true);
@@ -1054,7 +1057,7 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
       }
     }
     // OS prefs come second:
-    for (final String locale : getDefaultLocales()) {
+    for (final String locale : getSystemLocalesForAcceptLanguage()) {
       final String localeLowerCase = locale.toLowerCase(Locale.ROOT);
       if (!locales.containsKey(localeLowerCase)) {
         locales.put(localeLowerCase, locale);
@@ -1064,35 +1067,22 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
     return TextUtils.join(",", locales.values());
   }
 
-  private static String[] getDefaultLocales() {
+  private static String[] getSystemLocalesForAcceptLanguage() {
     if (VERSION.SDK_INT >= 24) {
       final LocaleList localeList = LocaleList.getDefault();
       final String[] locales = new String[localeList.size()];
       for (int i = 0; i < localeList.size(); i++) {
-        locales[i] = localeList.get(i).toLanguageTag();
+        // accept-language should be language or language-region format.
+        locales[i] = LocaleUtils.getLanguageTagForAcceptLanguage(localeList.get(i));
       }
       return locales;
     }
     final String[] locales = new String[1];
     final Locale locale = Locale.getDefault();
-    locales[0] = locale.toLanguageTag();
+    locales[0] = LocaleUtils.getLanguageTagForAcceptLanguage(locale);
     return locales;
   }
 
-  private static String getLanguageTag(final Locale locale) {
-    final StringBuilder out = new StringBuilder(locale.getLanguage());
-    final String country = locale.getCountry();
-    final String variant = locale.getVariant();
-    if (!TextUtils.isEmpty(country)) {
-      out.append('-').append(country);
-    }
-    if (!TextUtils.isEmpty(variant)) {
-      out.append('-').append(variant);
-    }
-    // e.g. "en", "en-US", or "en-US-POSIX".
-    return out.toString();
-  }
-
   /**
    * Sets whether Web Manifest processing support is enabled.
    *