From 476725d0111d615a2acaaa8750bd4ae9ee2a0a61 Mon Sep 17 00:00:00 2001 From: Garrett Boyer Date: Tue, 1 Aug 2017 14:11:02 -0700 Subject: [PATCH] Revert multi-package APK flag to off. Disable tests when multi-package APK is disabled. Test: Ran framework tests with flag both on and off. Change-Id: I0aae693816af06eebe1bc6cdeebf8dad4c179260 (cherry picked from commit 17041530bfa8199414b8480691303739b30126b4) --- core/java/android/content/pm/PackageParser.java | 3 +-- .../src/android/content/pm/PackageParserTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 4ae1aaf713499..629bd57b4b195 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -155,9 +155,8 @@ public class PackageParser { private static final String PROPERTY_CHILD_PACKAGES_ENABLED = "persist.sys.child_packages_enabled"; - // TODO: Decide the correct default before O-MR1. private static final boolean MULTI_PACKAGE_APK_ENABLED = Build.IS_DEBUGGABLE && - SystemProperties.getBoolean(PROPERTY_CHILD_PACKAGES_ENABLED, true); + SystemProperties.getBoolean(PROPERTY_CHILD_PACKAGES_ENABLED, false); private static final int MAX_PACKAGES_PER_APK = 5; diff --git a/core/tests/coretests/src/android/content/pm/PackageParserTest.java b/core/tests/coretests/src/android/content/pm/PackageParserTest.java index fda0f1e745435..53f4f3a8af9ad 100644 --- a/core/tests/coretests/src/android/content/pm/PackageParserTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageParserTest.java @@ -28,6 +28,7 @@ import android.content.pm.PackageParser.Permission; import android.os.Build; import android.os.Bundle; import android.os.FileUtils; +import android.os.SystemProperties; import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; @@ -398,8 +399,19 @@ public class PackageParserTest { "key2", "this_is_provider"); } + /** + * Determines if the current device supports multi-package APKs. + */ + private boolean supportsMultiPackageApk() { + return SystemProperties.getBoolean("persist.sys.child_packages_enabled", false); + } + @Test public void testMultiPackageComponents() throws Exception { + // TODO(gboyer): Remove once we decide to launch multi-package APKs. + if (!supportsMultiPackageApk()) { + return; + } String parentName = "com.android.frameworks.coretests.install_multi_package"; String firstChildName = "com.android.frameworks.coretests.install_multi_package.first_child";