From 817e168e370a6b766c4e2e8850bf3048810e8f8b Mon Sep 17 00:00:00 2001
From: danielwbhuang <danielwbhuang@google.com>
Date: Tue, 22 Mar 2022 18:42:13 +0800
Subject: [PATCH] [Panlingual][patch] Handle onLocaleSelected.

1. reference: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/17157185/13/core/java/com/android/internal/app/LocaleStore.java#204
2. check isSystemLocale()

Bug: 223090738
Test: local test pass
Change-Id: I42fbd06495880698201831d947d28515fb674a5a
---
 .../android/settings/localepicker/AppLocalePickerActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index 227b5e35bae..b3c56eacddc 100644
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -97,8 +97,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
 
     @Override
     public void onLocaleSelected(LocaleStore.LocaleInfo localeInfo) {
-        // TODO(b/223090003): check localeInfo.isSystemLocale()
-        if (localeInfo == null || localeInfo.getLocale() == null) {
+        if (localeInfo == null || localeInfo.getLocale() == null || localeInfo.isSystemLocale()) {
             setAppDefaultLocale("");
         } else {
             setAppDefaultLocale(localeInfo.getLocale().getLanguage());