From 4c41490cb39df1169bf80e5ae3b22ca4d17af28f Mon Sep 17 00:00:00 2001
From: Calvin Pan <calvinpan@google.com>
Date: Wed, 13 Apr 2022 06:10:20 +0000
Subject: [PATCH] Only add system language on locale page

Bug: 229044305
Test: manual
Change-Id: Ia61aadbfe38969e54861dcbeb7ac4addc5f8d3be
---
 .../com/android/internal/app/LocalePickerWithRegion.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java
index 380ace0c70235..4578842acc0d0 100644
--- a/core/java/com/android/internal/app/LocalePickerWithRegion.java
+++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java
@@ -175,8 +175,9 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
 
             // Add current system language into suggestion list
             for(LocaleStore.LocaleInfo localeInfo: LocaleStore.getSystemCurrentLocaleInfo()) {
-                if (appCurrentLocale == null ||
-                        !localeInfo.getLocale().equals(appCurrentLocale.getLocale())) {
+                boolean isNotCurrentLocale = appCurrentLocale == null
+                        || !localeInfo.getLocale().equals(appCurrentLocale.getLocale());
+                if (!isForCountryMode && isNotCurrentLocale) {
                     mLocaleList.add(localeInfo);
                 }
             }