Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa212e3 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit 'a74d1332':
  Revert "fix potential memory leak"
parents 6bbc79f2 a74d1332

libs/androidfw/ResourceTypes.cpp

+0 −3
Original line number Diff line number Diff line
@@ -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 {