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

Commit b8a93512 authored by Garrett Boyer's avatar Garrett Boyer
Browse files

Remove child package max. 

Any value we pick now is likely not to make any sense later.  Since devices
don't have any limit on the number of installed apps, and we're talking
about priv-apps here, a limit isn't necessary.

Test: Framework tests and on Pixel device.

Change-Id: I05b1edc0e96dd8ca2a16e8a542f302efb1dcf6f8
parent 846f7ffe

core/java/android/content/pm/PackageParser.java

+0 −10
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ public class PackageParser { 
    private static final boolean MULTI_PACKAGE_APK_ENABLED = Build.IS_DEBUGGABLE &&

            SystemProperties.getBoolean(PROPERTY_CHILD_PACKAGES_ENABLED, false);



    private static final int MAX_PACKAGES_PER_APK = 5;



    public static final int APK_SIGNING_UNKNOWN = 0;

    public static final int APK_SIGNING_V1 = 1;

    public static final int APK_SIGNING_V2 = 2;
@@ -1958,14 +1956,6 @@ public class PackageParser { 
     */

    private boolean parseBaseApkChild(Package parentPkg, Resources res, XmlResourceParser parser,

            int flags, String[] outError) throws XmlPullParserException, IOException {

        // Let ppl not abuse this mechanism by limiting the packages per APK

        if (parentPkg.childPackages != null && parentPkg.childPackages.size() + 2

                > MAX_PACKAGES_PER_APK) {

            outError[0] = "Maximum number of packages per APK is: " + MAX_PACKAGES_PER_APK;

            mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;

            return false;

        }



        // Make sure we have a valid child package name

        String childPackageName = parser.getAttributeValue(null, "package");

        if (validateName(childPackageName, true, false) != null) {