From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 4 Nov 2010 14:26:37 +0000 (-0700)
Subject: Merge "Support changing style parent in overlays"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/feea11dc0b8a3ffd908fc6d0a076c8dc575c4de0?hp=61fcc4d32494a31500da3fbdc6d3ddeb12fdd05e

Merge "Support changing style parent in overlays"
---

diff --git a/ResourceTable.cpp b/ResourceTable.cpp
index a2f085a..82c143d 100644
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -1629,13 +1629,6 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos,
     
     // If a parent is explicitly specified, set it.
     if (bagParent.size() > 0) {
-        String16 curPar = e->getParent();
-        if (curPar.size() > 0 && curPar != bagParent) {
-            sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n",
-                            String8(e->getParent()).string(),
-                            String8(bagParent).string());
-            return UNKNOWN_ERROR;
-        }
         e->setParent(bagParent);
     }
 
@@ -1683,13 +1676,6 @@ status_t ResourceTable::addBag(const SourcePos& sourcePos,
 
     // If a parent is explicitly specified, set it.
     if (bagParent.size() > 0) {
-        String16 curPar = e->getParent();
-        if (curPar.size() > 0 && curPar != bagParent) {
-            sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n",
-                    String8(e->getParent()).string(),
-                    String8(bagParent).string());
-            return UNKNOWN_ERROR;
-        }
         e->setParent(bagParent);
     }