Merge "Fix up getAttributeFlags() function" (2d5ddd18) · Commits · e / os / android_frameworks_base

tools/aapt/ResourceTable.cpp

+2 −6

Original line number	Diff line number	Diff line
		@@ -2304,10 +2304,8 @@ bool ResourceTable::getAttributeFlags(

		const char16_t* end = name + nameLen;
		const char16_t* pos = name;
		bool failed = false;
		while (pos < end && !failed) {
		while (pos < end) {
		const char16_t* start = pos;
		end++;
		while (pos < end && *pos != '\|') {
		pos++;
		}
		@@ -2333,10 +2331,8 @@ bool ResourceTable::getAttributeFlags(
		// Didn't find this flag identifier.
		return false;
		}
		if (pos < end) {
		pos++;
		}
		}

		return true;
		}