drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev

Browse Source 
* commit 'fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
  AAPT: Fix printing of resource configurations
This commit is contained in:
Adam Lesinski
2015-07-28 00:16:38 +00:00
committed by Android Git Automerger
parent 3bb0bb3afc fd44b56d59
commit e1e94c7d58
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/androidfw/ResourceTypes.cpp
View File

@ -6758,7 +6758,13 @@ void ResTable::print(bool inclValues) const
printf(" NON-INTEGER ResTable_type ADDRESS: %p\n", type); printf(" NON-INTEGER ResTable_type ADDRESS: %p\n", type);
continue; 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 printf(" config %s:\n", configStr.size() > 0
? configStr.string() : "(default)"); ? configStr.string() : "(default)");
size_t entryCount = dtohl(type->entryCount); size_t entryCount = dtohl(type->entryCount);