From 304b4de6ba71d972aa535f526418a4872b18c7b4 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <>
Date: Fri, 3 Apr 2009 16:45:18 -0700
Subject: 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 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tools/aapt/ResourceTable.cpp')

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,
-- 
cgit v1.2.3-59-g8ed1b