diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-08-15 01:15:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-14 16:46:52 +0000 |
commit | d7df9d7b38064b81e1b035893001499e79fc3cc0 (patch) | |
tree | 72ff9f9e57ab56729a9d76bc208eeb6fba616c49 /libs/androidfw | |
parent | ea39c1be300dd1ebfec4a90052f4b44847a278f9 (diff) | |
parent | e23a91e2bdab06e3c0c64201e88e50ab76c6b74b (diff) | |
download | frameworks_base-d7df9d7b38064b81e1b035893001499e79fc3cc0.zip frameworks_base-d7df9d7b38064b81e1b035893001499e79fc3cc0.tar.gz frameworks_base-d7df9d7b38064b81e1b035893001499e79fc3cc0.tar.bz2 |
Merge "Fix aapt dump for APKs with no resources" into lmp-dev
Diffstat (limited to 'libs/androidfw')
-rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 25 | ||||
-rw-r--r-- | libs/androidfw/tests/ResTable_test.cpp | 17 |
2 files changed, 25 insertions, 17 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 446004b..702f150 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -2855,17 +2855,16 @@ struct ResTable::Type struct ResTable::Package { Package(ResTable* _owner, const Header* _header, const ResTable_package* _package) - : owner(_owner), header(_header), package(_package), typeIdOffset(0) { - if (dtohs(package->header.headerSize) == sizeof(package)) { + : owner(_owner), header(_header), typeIdOffset(0) { + if (_package != NULL && dtohs(_package->header.headerSize) == sizeof(_package)) { // The package structure is the same size as the definition. // This means it contains the typeIdOffset field. - typeIdOffset = package->typeIdOffset; + typeIdOffset = _package->typeIdOffset; } } const ResTable* const owner; const Header* const header; - const ResTable_package* const package; ResStringPool typeStrings; ResStringPool keyStrings; @@ -3364,6 +3363,10 @@ status_t ResTable::addEmpty(const int32_t cookie) { header->header = (const ResTable_header*) resHeader; mHeaders.add(header); + + PackageGroup* pg = new PackageGroup(this, String16(), 0); + pg->packages.add(new Package(this, header, NULL)); + mPackageGroups.add(pg); return (mError=NO_ERROR); } @@ -5932,7 +5935,7 @@ status_t ResTable::createIdmap(const ResTable& overlay, *outSize += 2 * sizeof(uint16_t); // overlay packages are assumed to contain only one package group - const String16 overlayPackage(overlay.mPackageGroups[0]->packages[0]->package->name); + const String16 overlayPackage(overlay.mPackageGroups[0]->name); for (size_t typeIndex = 0; typeIndex < pg->types.size(); ++typeIndex) { const TypeList& typeList = pg->types[typeIndex]; @@ -6207,11 +6210,6 @@ void ResTable::print(bool inclValues) const if (mError != 0) { printf("mError=0x%x (%s)\n", mError, strerror(mError)); } -#if 0 - char localeStr[RESTABLE_MAX_LOCALE_LEN]; - mParams.getBcp47Locale(localeStr); - printf("mParams=%s,\n" localeStr); -#endif size_t pgCount = mPackageGroups.size(); printf("Package Groups (%d)\n", (int)pgCount); for (size_t pgIndex=0; pgIndex<pgCount; pgIndex++) { @@ -6220,13 +6218,6 @@ void ResTable::print(bool inclValues) const (int)pgIndex, pg->id, (int)pg->packages.size(), String8(pg->name).string()); - size_t pkgCount = pg->packages.size(); - for (size_t pkgIndex=0; pkgIndex<pkgCount; pkgIndex++) { - const Package* pkg = pg->packages[pkgIndex]; - printf(" Package %d id=%d name=%s\n", (int)pkgIndex, - pkg->package->id, String8(String16(pkg->package->name)).string()); - } - for (size_t typeIndex=0; typeIndex < pg->types.size(); typeIndex++) { const TypeList& typeList = pg->types[typeIndex]; if (typeList.isEmpty()) { diff --git a/libs/androidfw/tests/ResTable_test.cpp b/libs/androidfw/tests/ResTable_test.cpp index 8016a82..68c228e 100644 --- a/libs/androidfw/tests/ResTable_test.cpp +++ b/libs/androidfw/tests/ResTable_test.cpp @@ -195,4 +195,21 @@ TEST(ResTableTest, resourceIsOverridenWithBetterConfig) { ASSERT_EQ(uint32_t(400), val.data); } +TEST(ResTableTest, emptyTableHasSensibleDefaults) { + const int32_t expectedCookie = 1; + + ResTable table; + ASSERT_EQ(NO_ERROR, table.addEmpty(expectedCookie)); + + ASSERT_EQ(uint32_t(1), table.getTableCount()); + ASSERT_EQ(uint32_t(1), table.getBasePackageCount()); + ASSERT_EQ(expectedCookie, table.getTableCookie(0)); + + const DynamicRefTable* dynamicRefTable = table.getDynamicRefTableForCookie(expectedCookie); + ASSERT_TRUE(dynamicRefTable != NULL); + + Res_value val; + ASSERT_LT(table.getResource(base::R::integer::number1, &val, MAY_NOT_BE_BAG), 0); +} + } |