commit 33d4bd4a9b42972fee3fc84a8babcef1030b72c1
author Adam Lesinski <adamlesinski@google.com> Tue Jul 28 00:35:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 28 00:35:46 2015 +0000
tree eb8f910c8320dffbf8060d638e7d3e5611776136
parent 089f65ed1e635b96f341562c78e86e43f20211a5
parent fd44b56d599bc6c6e7397dcdfaa6d613805a88cb

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

* commit 'fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
  AAPT: Fix printing of resource configurations

libs/androidfw/ResourceTypes.cpp

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 @@
                     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);