diff options
| author | 2014-02-17 11:06:38 +0000 | |
|---|---|---|
| committer | 2014-02-17 11:06:38 +0000 | |
| commit | 8c1fc83445f8dce7e6d0789feeed8bf98d33bf01 (patch) | |
| tree | b9eae6651529003e33abaea6a3f18fd17266fb42 /tools/aapt/ResourceTable.cpp | |
| parent | 982931c72b6cd00c5eea28efc4b086f47f7aca17 (diff) | |
| parent | 28879bbfe89dc4bf2067a7183975ecffb82f68e6 (diff) | |
am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
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; |