Merge "Fix up getAttributeFlags() function"

2012-03-07 16:16:18 -08:00
parent 78c914f37a 59eb5fd509
commit 2d5ddd1868
1 changed files with 2 additions and 6 deletions
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -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,9 +2331,7 @@ bool ResourceTable::getAttributeFlags(
                // Didn't find this flag identifier.
                return false;
            }
-            if (pos < end) {
-                pos++;
-            }
+            pos++;
        }

        return true;