diff options
| author | Narayan Kamath <narayan@google.com> | 2014-07-07 10:11:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-07 10:11:23 +0000 |
| commit | 10eb3b0665dd7c636af5f0d657512c1a2e309e0c (patch) | |
| tree | d4897b9b5b32cda400ca5d0ea29c140b337f8f88 /libs | |
| parent | 048d1076aeb96adea969ad95996d3df931557241 (diff) | |
| parent | e0849423214007d4377638fb42db15276e3ca575 (diff) | |
| download | frameworks_base-10eb3b0665dd7c636af5f0d657512c1a2e309e0c.zip frameworks_base-10eb3b0665dd7c636af5f0d657512c1a2e309e0c.tar.gz frameworks_base-10eb3b0665dd7c636af5f0d657512c1a2e309e0c.tar.bz2 | |
am e0849423: am 501bb0a5: Merge "Fix issue when converting fil->tl."
* commit 'e0849423214007d4377638fb42db15276e3ca575':
Fix issue when converting fil->tl.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 482dfc8..56c95bd 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -365,7 +365,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. @@ -374,7 +373,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) { |