From caf664cd605033ce1ef8a2352d0886b2d763db18 Mon Sep 17 00:00:00 2001
From: Allen Su <allenwtsu@google.com>
Date: Mon, 3 Feb 2025 07:13:41 +0000
Subject: [PATCH] Fix unnecessary dialog

Bug: 388426025
Test: UI verification
Flag: com.android.settings.flags.regional_preferences_api_enabled
Change-Id: Ie4adff23b5b2fc26ef97478f6732eb300d088bd7
---
 .../RegionPickerBaseListPreferenceController.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/regionalpreferences/RegionPickerBaseListPreferenceController.java b/src/com/android/settings/regionalpreferences/RegionPickerBaseListPreferenceController.java
index 338ecc978af..c06c6695220 100644
--- a/src/com/android/settings/regionalpreferences/RegionPickerBaseListPreferenceController.java
+++ b/src/com/android/settings/regionalpreferences/RegionPickerBaseListPreferenceController.java
@@ -154,7 +154,7 @@ public abstract class RegionPickerBaseListPreferenceController extends BasePrefe
 
     private List<LocaleStore.LocaleInfo> getSortedLocaleList(
             List<LocaleStore.LocaleInfo> localeInfos) {
-        final Locale sortingLocale = Locale.getDefault();
+        final Locale sortingLocale = LocaleList.getDefault().get(0);
         final LocaleHelper.LocaleInfoComparator comp =
                 new LocaleHelper.LocaleInfoComparator(sortingLocale, true);
         Collections.sort(localeInfos, comp);
@@ -162,7 +162,7 @@ public abstract class RegionPickerBaseListPreferenceController extends BasePrefe
     }
 
     private void switchRegion(LocaleStore.LocaleInfo localeInfo) {
-        if (localeInfo.getLocale().equals(Locale.getDefault())) {
+        if (localeInfo.getLocale().equals(LocaleList.getDefault().get(0))) {
             return;
         }