diff options
Diffstat (limited to 'tools/aapt2/Locale.cpp')
| -rw-r--r-- | tools/aapt2/Locale.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt2/Locale.cpp b/tools/aapt2/Locale.cpp index 6acf3b09d301..12f56fc11226 100644 --- a/tools/aapt2/Locale.cpp +++ b/tools/aapt2/Locale.cpp @@ -253,7 +253,7 @@ std::string LocaleValue::toDirName() const { void LocaleValue::initFromResTable(const ResTable_config& config) { config.unpackLanguage(language); config.unpackRegion(region); - if (config.localeScriptWasProvided) { + if (config.localeScript[0] && !config.localeScriptWasComputed) { memcpy(script, config.localeScript, sizeof(config.localeScript)); } @@ -268,10 +268,10 @@ void LocaleValue::writeTo(ResTable_config* out) const { if (script[0]) { memcpy(out->localeScript, script, sizeof(out->localeScript)); - out->localeScriptWasProvided = true; + out->localeScriptWasComputed = false; } else { out->computeScript(); - out->localeScriptWasProvided = false; + out->localeScriptWasComputed = true; } if (variant[0]) { |