Merge "AAPT: Include empty locale in getLocales" into oc-dev (19af4cc3) · Commits · e / os / android_frameworks_base

libs/androidfw/ResourceTypes.cpp

+6 −8

Original line number	Diff line number	Diff line
		@@ -5999,7 +5999,6 @@ void ResTable::getLocales(Vector<String8>* locales, bool includeSystemLocales,
		char locale[RESTABLE_MAX_LOCALE_LEN];

		forEachConfiguration(false, false, includeSystemLocales, [&](const ResTable_config& cfg) {
		if (cfg.locale != 0) {
		cfg.getBcp47Locale(locale, mergeEquivalentLangs /* canonicalize if merging */);

		const auto beginIter = locales->begin();
		@@ -6009,7 +6008,6 @@ void ResTable::getLocales(Vector<String8>* locales, bool includeSystemLocales,
		if (iter == endIter \|\| strcmp(iter->string(), locale) != 0) {
		locales->insertAt(String8(locale), std::distance(beginIter, iter));
		}
		}
		});
		}