From b8a9351214e28ebac91d2b6a2b545b832007dddf Mon Sep 17 00:00:00 2001 From: Garrett Boyer Date: Thu, 3 Aug 2017 16:12:07 -0700 Subject: [PATCH] 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 --- core/java/android/content/pm/PackageParser.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index dc171f56095f4..d62a946d76de6 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -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) {