From: Dan Morrill <morrildl@google.com>
Date: Tue, 14 Dec 2010 19:28:50 +0000 (-0800)
Subject: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/b3a9ca1e671a74fe41d2d9cd97acc2553f3a6bc7?hp=6c259a8c457f8e5d9a019c47941dcf414e001efc

am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread

* commit '5441a9ff2128cf2c5088974c74b79d2d1734f755':
  GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
---

diff --git a/ResourceTable.cpp b/ResourceTable.cpp
index 29644a6..fc576a6 100644
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -1724,13 +1724,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);
     }
 
@@ -1778,13 +1771,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);
     }