am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev

* commit '5bcfb6b98261c94a6ff33438e6b29ca71bb3c0eb':
  Fix assumption about DynamicRefTable in aapt

2 files changed, 16 insertions, 5 deletions

diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index f963a4e..2a4dec0 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -6212,11 +6212,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++) {
diff --git a/libs/androidfw/tests/ResTable_test.cpp b/libs/androidfw/tests/ResTable_test.cpp
index 8016a82..89d271d0 100644
--- a/libs/androidfw/tests/ResTable_test.cpp
+++ b/libs/androidfw/tests/ResTable_test.cpp
@@ -195,4 +195,20 @@ TEST(ResTableTest, resourceIsOverridenWithBetterConfig) {
     ASSERT_EQ(uint32_t(400), val.data);
 }
 
+TEST(ResTableTest, emptyTableHasSensibleDefaults) {
+    const int32_t assetCookie = 1;
+
+    ResTable table;
+    ASSERT_EQ(NO_ERROR, table.addEmpty(assetCookie));
+
+    // Adding an empty table gives us one table!
+    ASSERT_EQ(uint32_t(1), table.getTableCount());
+
+    // Adding an empty table doesn't mean we get packages.
+    ASSERT_EQ(uint32_t(0), table.getBasePackageCount());
+
+    Res_value val;
+    ASSERT_LT(table.getResource(base::R::integer::number1, &val, MAY_NOT_BE_BAG), 0);
+}
+
 }