diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-28 00:16:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 00:16:38 +0000 |
| commit | e1e94c7d58a176c3250438d4fdd35ef552cfe92a (patch) | |
| tree | 50d014a6eb583e0f072c0690cc56075c24c4d6de | |
| parent | 3bb0bb3afc46f88e4372f6912bd4c18547de5a78 (diff) | |
| parent | fd44b56d599bc6c6e7397dcdfaa6d613805a88cb (diff) | |
| download | frameworks_base-e1e94c7d58a176c3250438d4fdd35ef552cfe92a.zip frameworks_base-e1e94c7d58a176c3250438d4fdd35ef552cfe92a.tar.gz frameworks_base-e1e94c7d58a176c3250438d4fdd35ef552cfe92a.tar.bz2 | |
am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit 'fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
AAPT: Fix printing of resource configurations
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index a95db9f..62aabb1 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -6758,7 +6758,13 @@ void ResTable::print(bool inclValues) const printf(" NON-INTEGER ResTable_type ADDRESS: %p\n", type); continue; } - String8 configStr = type->config.toString(); + + // Always copy the config, as fields get added and we need to + // set the defaults. + ResTable_config thisConfig; + thisConfig.copyFromDtoH(type->config); + + String8 configStr = thisConfig.toString(); printf(" config %s:\n", configStr.size() > 0 ? configStr.string() : "(default)"); size_t entryCount = dtohl(type->entryCount); |