From cfb04f4c3554bebcebcf452260f1e608b5299d7c Mon Sep 17 00:00:00 2001
From: Calvin Pan <calvinpan@google.com>
Date: Wed, 23 Mar 2022 04:43:00 +0000
Subject: [PATCH] Fix System language option missing and locale region missing
 issue

- Taking app package name into LocalePickerWithRegion
- Using toLanguageTag() instead of getLanguage() to prevent locale
 region missing

Bug: 226278910
Bug: 226280740
Change-Id: Ieac42616192065abc0cf82db023e4e50f1ca562d
Test: To be verified
(cherry picked from commit c117a89a534fa406414496d659ca5ea37628967f)
---
 .../android/settings/localepicker/AppLocalePickerActivity.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index 34b7472072c..263d390fc34 100644
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -100,7 +100,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
         if (localeInfo == null || localeInfo.getLocale() == null || localeInfo.isSystemLocale()) {
             setAppDefaultLocale("");
         } else {
-            setAppDefaultLocale(localeInfo.getLocale().getLanguage());
+            setAppDefaultLocale(localeInfo.getLocale().toLanguageTag());
         }
         finish();
     }