From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 10 Jun 2011 14:45:38 +0000 (-0700)
Subject: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/fadaaa2128ec7367194738a3daccf2b3346295d9?hp=98749835c8a75f60e3ff6e35c8ae62d11924effc

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 --git a/ResourceTable.cpp b/ResourceTable.cpp
index f3ca23d..81b924a 100644
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -3209,7 +3209,7 @@ status_t ResourceTable::Entry::assignResourceIds(ResourceTable* table,
         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 @@ status_t ResourceTable::Entry::assignResourceIds(ResourceTable* table,
             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,