am a74d1332: am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak""

* commit 'a74d1332cc9f63dc3187cfa74befb448dab5e77d': Revert "fix potential memory leak"
2013-01-03 18:53:06 -08:00
parent 6bbc79f26e a74d1332cc
commit 0aa212e32a
1 changed files with 0 additions and 3 deletions
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@ -5038,14 +5038,11 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg,
        } else {
            group = mPackageGroups.itemAt(idx-1);
            if (group == NULL) {
-                delete package;
                return (mError=UNKNOWN_ERROR);
            }
        }
        err = group->packages.add(package);
        if (err < NO_ERROR) {
-            delete group;
-            delete package;
            return (mError=err);
        }
    } else {