commit 304b4de6ba71d972aa535f526418a4872b18c7b4
author Robert Greenwalt Fri Apr 03 16:45:18 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Apr 03 16:45:18 2009 -0700
tree d224e80cdad2459b2646d5c95bc76bf776d1361d
parent e2b23e11a5475e5c35eb07ba883cb05eca18796f

AI 144548: am: CL 144547 Fix change 144342 by making it active only during overlay processing.
  Original author: rgreenwalt

Automated import of CL 144548

tools/aapt/ResourceTable.cpp

diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 6e522a2..a09b1a6 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -1449,8 +1449,11 @@
     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,