drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f795e9a86d4f62e5314ef95978c3ea17d90975db':
  Okay *now* really enforce the limit on non-public styles.
This commit is contained in:
Dianne Hackborn
2011-06-09 17:28:00 -07:00
committed by Android Git Automerger
parent 820caf7b04 f795e9a86d
commit c6adfed6dc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/ResourceTable.cpp
View File

@ -3209,7 +3209,7 @@ status_t ResourceTable::Entry::assignResourceIds(ResourceTable* table,
const String16 id16("id"); const String16 id16("id");
mParentId = 0; mParentId = 0;
if (mParent.size() > 0) { if (mParent.size() > 0) {
mParentId = table->getResId(mParent, &style16, NULL, &errorMsg, false); mParentId = table->getResId(mParent, &style16, NULL, &errorMsg);
if (mParentId == 0) { if (mParentId == 0) {
mPos.error("Error retrieving parent for item: %s '%s'.\n", mPos.error("Error retrieving parent for item: %s '%s'.\n",
errorMsg, String8(mParent).string()); errorMsg, String8(mParent).string());
@ -3221,7 +3221,7 @@ status_t ResourceTable::Entry::assignResourceIds(ResourceTable* table,
const String16& key = mBag.keyAt(i); const String16& key = mBag.keyAt(i);
Item& it = mBag.editValueAt(i); Item& it = mBag.editValueAt(i);
it.bagKeyId = table->getResId(key, 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); //printf("Bag key of %s: #%08x\n", String8(key).string(), it.bagKeyId);
if (it.bagKeyId == 0) { if (it.bagKeyId == 0) {
it.sourcePos.error("Error: %s: %s '%s'.\n", errorMsg, it.sourcePos.error("Error: %s: %s '%s'.\n", errorMsg,