Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 267b93c7 authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

Merge "Fix empty resource showing "Und"" into tm-dev am: f71832b4 am: b5ba0f40 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983788



Change-Id: I07f4717858d45db368d5e4638495841bd89c7a9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23b83424 b5ba0f40

core/java/com/android/internal/app/AppLocaleStore.java

+10 −5
Original line number Diff line number Diff line
@@ -51,14 +51,18 @@ 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);

                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;

                }

            }

        }

        Log.d(TAG, "getAppSupportedLocales(). status: " + localeStatus
@@ -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,

        }