diff options
| author | 2009-04-03 16:45:18 -0700 | |
|---|---|---|
| committer | 2009-04-03 16:45:18 -0700 | |
| commit | 304b4de6ba71d972aa535f526418a4872b18c7b4 (patch) | |
| tree | d224e80cdad2459b2646d5c95bc76bf776d1361d /tools/aapt/ResourceTable.cpp | |
| parent | e2b23e11a5475e5c35eb07ba883cb05eca18796f (diff) | |
AI 144548: am: CL 144547 Fix change 144342 by making it active only during overlay processing.
Original author: rgreenwalt
Automated import of CL 144548
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 6e522a2c74c8..a09b1a65bb95 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/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, |