diff options
| author | 2014-02-17 03:03:49 -0800 | |
|---|---|---|
| committer | 2014-02-17 03:03:49 -0800 | |
| commit | 28879bbfe89dc4bf2067a7183975ecffb82f68e6 (patch) | |
| tree | af994f62d0f6fa15ae2d1355f9632a87da083c04 /tools/aapt/ResourceTable.cpp | |
| parent | 183e5e038bd844ac415b14f22df5c476732066c8 (diff) | |
| parent | be57fca41a731217010d9f92554cf48708b06ecf (diff) | |
am be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit 'be57fca41a731217010d9f92554cf48708b06ecf':
Extended locales in AAPT / AssetManager.
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 6ced8b3f915a..38bf5402b040 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1292,8 +1292,8 @@ status_t compileResourceFile(Bundle* bundle, curIsStyled = true; } else if (strcmp16(block.getElementName(&len), string16.string()) == 0) { // Note the existence and locale of every string we process - char rawLocale[16]; - curParams.getLocale(rawLocale); + char rawLocale[RESTABLE_MAX_LOCALE_LEN]; + curParams.getBcp47Locale(rawLocale); String8 locale(rawLocale); String16 name; String16 translatable; |