Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 663a52d6 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

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

parents 66f5a13f 978ab9d9
Loading
Loading
Loading
Loading
+18 −1
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ public:
        { }

        Entry(const Entry& entry);
        Entry& operator=(const Entry& entry);

        virtual ~Entry() { }