diff options
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index f661f29bb7f9..c3ae7a419c75 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -5997,16 +5997,14 @@ 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 */); + cfg.getBcp47Locale(locale, mergeEquivalentLangs /* canonicalize if merging */); - const auto beginIter = locales->begin(); - const auto endIter = locales->end(); + const auto beginIter = locales->begin(); + const auto endIter = locales->end(); - auto iter = std::lower_bound(beginIter, endIter, locale, compareString8AndCString); - if (iter == endIter || strcmp(iter->string(), locale) != 0) { - locales->insertAt(String8(locale), std::distance(beginIter, iter)); - } + auto iter = std::lower_bound(beginIter, endIter, locale, compareString8AndCString); + if (iter == endIter || strcmp(iter->string(), locale) != 0) { + locales->insertAt(String8(locale), std::distance(beginIter, iter)); } }); } |