diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-10 07:45:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-10 07:45:38 -0700 |
| commit | f14dff1219d2a87340dccad657f666f5451d8c6e (patch) | |
| tree | 32b39d7d93170aed01c11e7353afc53a2b306cb4 /tools | |
| parent | 9980043e930f877c4cd066de2b3d57dce4fc926e (diff) | |
| parent | c6adfed6dcea8482e482db58bd396ea8de08426a (diff) | |
| download | frameworks_base-f14dff1219d2a87340dccad657f666f5451d8c6e.zip frameworks_base-f14dff1219d2a87340dccad657f666f5451d8c6e.tar.gz frameworks_base-f14dff1219d2a87340dccad657f666f5451d8c6e.tar.bz2 | |
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.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index f3ca23d..81b924a 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/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, |