]> git.saurik.com Git - android/aapt.git/commitdiff
AI 144547: Fix change 144342 by making it active only during overlay processing.
authorRobert Greenwalt <>
Fri, 3 Apr 2009 23:44:30 +0000 (16:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Apr 2009 23:44:30 +0000 (16:44 -0700)
  BUG=1754390

Automated import of CL 144547

ResourceTable.cpp

index 6e522a2c74c80a71b367e1f9a594e2897b1bf8b4..a09b1a65bb955e6bbb7ca5637a6994ac37a72803 100644 (file)
@@ -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,