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

Commit a5ae641b authored by Robert Greenwalt's avatar Robert Greenwalt Committed by The Android Open Source Project
Browse files

Merge branch 'readonly-p4-master'

parents 8e588484 304b4de6

tools/aapt/ResourceTable.cpp

+5 −2
Original line number Diff line number Diff line
@@ -1450,8 +1450,11 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos, 
        return result;

    }



    if (replace) { 

        return e->emptyBag(sourcePos);

    }

    return result;

}



status_t ResourceTable::addBag(const SourcePos& sourcePos,

                               const String16& package,