From 8d8d93bf6d9257475ae7640178a90484046b6c9a Mon Sep 17 00:00:00 2001 From: Calvin Pan Date: Thu, 28 Apr 2022 05:53:07 +0000 Subject: [PATCH] Fix empty resource showing "Und" Bug: 230689140 Test: manual Change-Id: Ib732773758bb8344f04033be11f235456434bd29 --- .../com/android/internal/app/AppLocaleStore.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/core/java/com/android/internal/app/AppLocaleStore.java b/core/java/com/android/internal/app/AppLocaleStore.java index f95838516927d..599e6d24600ca 100644 --- a/core/java/com/android/internal/app/AppLocaleStore.java +++ b/core/java/com/android/internal/app/AppLocaleStore.java @@ -51,13 +51,17 @@ class AppLocaleStore { appSupportedLocales.add(packageLocaleList.get(i)); } } else { - localeStatus = LocaleStatus.NO_SUPPORTED_LANGUAGE; + localeStatus = LocaleStatus.NO_SUPPORTED_LANGUAGE_IN_APP; } } else if (localeConfig.getStatus() == LocaleConfig.STATUS_NOT_SPECIFIED) { - localeStatus = LocaleStatus.GET_SUPPORTED_LANGUAGE_FROM_ASSET; String[] languages = getAssetLocales(context, packageName); - for (String language : languages) { - appSupportedLocales.add(Locale.forLanguageTag(language)); + if (languages.length > 0) { + localeStatus = LocaleStatus.GET_SUPPORTED_LANGUAGE_FROM_ASSET; + for (String language : languages) { + appSupportedLocales.add(Locale.forLanguageTag(language)); + } + } else { + localeStatus = LocaleStatus.ASSET_LOCALE_IS_EMPTY; } } } @@ -89,7 +93,8 @@ class AppLocaleStore { static class AppLocaleResult { enum LocaleStatus { UNKNOWN_FAILURE, - NO_SUPPORTED_LANGUAGE, + NO_SUPPORTED_LANGUAGE_IN_APP, + ASSET_LOCALE_IS_EMPTY, GET_SUPPORTED_LANGUAGE_FROM_LOCAL_CONFIG, GET_SUPPORTED_LANGUAGE_FROM_ASSET, }