Merge "Fix empty resource showing "Und"" into tm-dev (f71832b4) · Commits · e / os / android_frameworks_base

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,
		}