From: Robert Greenwalt <> Date: Fri, 3 Apr 2009 23:44:30 +0000 (-0700) Subject: AI 144547: Fix change 144342 by making it active only during overlay processing. X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/9d911eb6c45dbbc59a5726587965e78fce2b5e63?hp=-c AI 144547: Fix change 144342 by making it active only during overlay processing. BUG=1754390 Automated import of CL 144547 --- 9d911eb6c45dbbc59a5726587965e78fce2b5e63 diff --git a/ResourceTable.cpp b/ResourceTable.cpp index 6e522a2..a09b1a6 100644 --- a/ResourceTable.cpp +++ b/ResourceTable.cpp @@ -1449,8 +1449,11 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos, if ((result = e->makeItABag(sourcePos)) != NO_ERROR) { return result; } - - return e->emptyBag(sourcePos); + + if (replace) { + return e->emptyBag(sourcePos); + } + return result; } status_t ResourceTable::addBag(const SourcePos& sourcePos,