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

Commit cf244044 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "AAPT: Include empty locale in getLocales" into oc-dev am: 19af4cc3 

am: 287a3725

Change-Id: I6c49d80d270d3877bce2652d687ef8434a68e333
parents 6a59db8f 287a3725

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));

        }

        }

    });

}