commit f795e9a86d4f62e5314ef95978c3ea17d90975db
author Dianne Hackborn <hackbod@google.com> Thu Jun 09 16:17:53 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Thu Jun 09 16:17:53 2011 -0700
tree 6823d69078ce14eb0aeffd2fd774cea163a52263
parent 8821ba860693f5206c56ae727a4231e4d6f0a735

Okay *now* really enforce the limit on non-public styles.

Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae

tools/aapt/ResourceTable.cpp

diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index e618877..d98b285 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -3209,7 +3209,7 @@
         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 @@
             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,