am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.

* commit 'c6adfed6dcea8482e482db58bd396ea8de08426a':
  Okay *now* really enforce the limit on non-public styles.

diff --combined ResourceTable.cpp
index f3ca23d9efaac8187b114648cb1d8683d1b27ca1,d98b285dd1e3c8be7b16d92886f0704559fc51ca..81b924af8d7e58192105549e397fc6a11b69d63d
--- 1/ResourceTable.cpp
--- 2/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@@ -3209,7 -3209,7 +3209,7 @@@ status_t ResourceTable::Entry::assignRe
          const String16 id16("id");
          mParentId = 0;
          if (mParent.size() > 0) {
-             mParentId = table->getResId(mParent, &style16, NULL, &errorMsg, false);
+             mParentId = table->getResId(mParent, &style16, NULL, &errorMsg);
              if (mParentId == 0) {
                  mPos.error("Error retrieving parent for item: %s '%s'.\n",
                          errorMsg, String8(mParent).string());
@@@ -3221,7 -3221,7 +3221,7 @@@
              const String16& key = mBag.keyAt(i);
              Item& it = mBag.editValueAt(i);
              it.bagKeyId = table->getResId(key,
-                     it.isId ? &id16 : &attr16, NULL, &errorMsg, false);
+                     it.isId ? &id16 : &attr16, NULL, &errorMsg);
              //printf("Bag key of %s: #%08x\n", String8(key).string(), it.bagKeyId);
              if (it.bagKeyId == 0) {
                  it.sourcePos.error("Error: %s: %s '%s'.\n", errorMsg,
@@@ -3706,9 -3706,7 +3706,9 @@@ sp<ResourceTable::Package> ResourceTabl
  {
      sp<Package> p = mPackages.valueFor(package);
      if (p == NULL) {
 -        if (mIsAppPackage) {
 +        if (mBundle->getIsOverlayPackage()) {
 +            p = new Package(package, 0x00);
 +        } else if (mIsAppPackage) {
              if (mHaveAppPackage) {
                  fprintf(stderr, "Adding multiple application package resources; only one is allowed.\n"
                                  "Use -x to create extended resources.\n");