Merge branch 'readonly-p4-master'

2009-04-03 16:46:32 -07:00
parent 8e58848436 304b4de6ba
commit a5ae641b0c
1 changed files with 5 additions and 2 deletions
--- 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,