Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing assignments to localeScriptWasComputed in aapt." into nyc-dev

Browse Source
This commit is contained in:
Andrew Johnson
2016-03-31 13:52:09 +00:00
committed by Android (Google) Code Review
parent 3db45036df 299e488ee2
commit 08a3fa7dea
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/AaptAssets.cpp
View File

@@ -388,10 +388,6 @@ void AaptLocaleValue::writeTo(ResTable_config* out) const {
if (script[0]) { if (script[0]) {
memcpy(out->localeScript, script, sizeof(out->localeScript)); memcpy(out->localeScript, script, sizeof(out->localeScript));
out->localeScriptWasComputed = false;
} else {
out->computeScript();
out->localeScriptWasComputed = true;
} }
if (variant[0]) { if (variant[0]) {

4
tools/aapt2/Locale.cpp
View File

@@ -268,10 +268,6 @@ void LocaleValue::writeTo(ResTable_config* out) const {
if (script[0]) { if (script[0]) {
memcpy(out->localeScript, script, sizeof(out->localeScript)); memcpy(out->localeScript, script, sizeof(out->localeScript));
out->localeScriptWasComputed = false;
} else {
out->computeScript();
out->localeScriptWasComputed = true;
} }
if (variant[0]) { if (variant[0]) {