Merge "Support changing style parent in overlays" (5580e44c) · Commits · e / os / android_frameworks_base

tools/aapt/ResourceTable.cpp

+0 −14

Original line number	Diff line number	Diff line
		@@ -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);
		}