From a3c4eb35b1b8507aa3d4d58fdbe1d31dc6253ffc Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Wed, 19 Apr 2017 23:51:33 -0700 Subject: [PATCH] Move child package feature behind sys prop Now one can do adb shell setprop/getptop to change "persist.sys.child_packages_enabled" to true/false to control whether child packages are supported. Test: manual bug:36107077 Change-Id: Ie60e255fd3c248905906cdd5b10adae074c0b717 --- core/java/android/content/pm/PackageParser.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 1f78bff9e1a7d..86093512090e8 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -145,7 +145,12 @@ public class PackageParser { private static final boolean DEBUG_PARSER = false; private static final boolean DEBUG_BACKUP = false; - private static final boolean MULTI_PACKAGE_APK_ENABLED = false; + private static final String PROPERTY_CHILD_PACKAGES_ENABLED = + "persist.sys.child_packages_enabled"; + + private static final boolean MULTI_PACKAGE_APK_ENABLED = + SystemProperties.getBoolean(PROPERTY_CHILD_PACKAGES_ENABLED, false); + private static final int MAX_PACKAGES_PER_APK = 5; public static final int APK_SIGNING_UNKNOWN = 0;