Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-09-26 00:51:35 +00:00
committed by Android (Google) Code Review
parent 66f5a13f92 978ab9d929
commit 663a52d68a
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/aapt/ResourceTable.cpp
View File

@@ -3310,6 +3310,19 @@ ResourceTable::Entry::Entry(const Entry& entry)
, mParentId(entry.mParentId)
, mPos(entry.mPos) {}
ResourceTable::Entry& ResourceTable::Entry::operator=(const Entry& entry) {
mName = entry.mName;
mParent = entry.mParent;
mType = entry.mType;
mItem = entry.mItem;
mItemFormat = entry.mItemFormat;
mBag = entry.mBag;
mNameIndex = entry.mNameIndex;
mParentId = entry.mParentId;
mPos = entry.mPos;
return *this;
}
status_t ResourceTable::Entry::makeItABag(const SourcePos& sourcePos)
{
if (mType == TYPE_BAG) {
@@ -4352,7 +4365,11 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) {
String8(entriesToAdd[i].value->getName()).string(),
entriesToAdd[i].key.toString().string());
c->addEntry(entriesToAdd[i].key, entriesToAdd[i].value);
sp<Entry> newEntry = t->getEntry(c->getName(),
entriesToAdd[i].value->getPos(),
&entriesToAdd[i].key);
*newEntry = *entriesToAdd[i].value;
}
}
}

1
tools/aapt/ResourceTable.h
View File

@@ -316,6 +316,7 @@ public:
{ }
Entry(const Entry& entry);
Entry& operator=(const Entry& entry);
virtual ~Entry() { }