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

Commit 23902f5f authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 10eb3b06: am e0849423: am 501bb0a5: Merge "Fix issue when converting fil->tl." 

* commit '10eb3b06':
  Fix issue when converting fil->tl.
parents e8e61e09 10eb3b06

libs/androidfw/AssetManager.cpp

+4 −2
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ void AssetManager::setLocaleLocked(const char* locale) 
        delete[] mLocale;

    }





    // If we're attempting to set a locale that starts with "fil",

    // we should convert it to "tl" for backwards compatibility since

    // we've been using "tl" instead of "fil" prior to L.
@@ -385,7 +384,10 @@ void AssetManager::setLocaleLocked(const char* locale) 
    // instead of attempting a fallback.

    if (strncmp(locale, kFilPrefix, kFilPrefixLen) == 0) {

        Vector<String8> locales;

        getLocales(&locales);

        ResTable* res = mResources;

        if (res != NULL) {

            res->getLocales(&locales);

        }

        const size_t localesSize = locales.size();

        bool hasFil = false;

        for (size_t i = 0; i < localesSize; ++i) {