PackageManagerService: remove unused support for onlyCore mode
Due to the removal of support for Full Disk Encryption,
the "core apps only" mode of system_server is no longer used, and
onlyCore is hard-coded to false. For details, see http://ag/17685636.
Remove the corresponding obsolete code from PackageManagerService and
the related classes InitAppsHelper, UserDataPreparer, PackageParser2,
and ParsingPackageUtils.
Bug: 208476087
Change-Id: I48289d1f74414f831504b38ac5c1bde719b07fb2
diff --git a/apct-tests/perftests/packagemanager/src/android/os/PackageParsingPerfTest.kt b/apct-tests/perftests/packagemanager/src/android/os/PackageParsingPerfTest.kt
index 67a3380..c061a7c 100644
--- a/apct-tests/perftests/packagemanager/src/android/os/PackageParsingPerfTest.kt
+++ b/apct-tests/perftests/packagemanager/src/android/os/PackageParsingPerfTest.kt
@@ -195,8 +195,7 @@
// For testing, just disable enforcement to avoid hooking up to compat framework
ParseTypeImpl(ParseInput.Callback { _, _, _ -> false })
}
- val parser = ParsingPackageUtils(false,
- null,
+ val parser = ParsingPackageUtils(null,
null,
emptyList(),
object :
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index ca7d77b..cd235e8 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -614,7 +614,6 @@
VerifierDeviceIdentity getVerifierDeviceIdentity();
boolean isFirstBoot();
- boolean isOnlyCoreApps();
boolean isDeviceUpgrading();
/** Reflects current DeviceStorageMonitorService state */
diff --git a/services/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java
index 58c22a75..d189df2 100644
--- a/services/core/java/android/content/pm/PackageManagerInternal.java
+++ b/services/core/java/android/content/pm/PackageManagerInternal.java
@@ -846,13 +846,6 @@
public abstract int[] getPermissionGids(String permissionName, int userId);
/**
- * Return if device is currently in a "core" boot environment, typically
- * used to support full-disk encryption. Only apps marked with
- * {@code coreApp} attribute are available.
- */
- public abstract boolean isOnlyCoreApps();
-
- /**
* Make a best-effort attempt to provide the requested free disk space by
* deleting cached files.
*
diff --git a/services/core/java/com/android/server/pm/IPackageManagerBase.java b/services/core/java/com/android/server/pm/IPackageManagerBase.java
index ba7309f..7a00557 100644
--- a/services/core/java/com/android/server/pm/IPackageManagerBase.java
+++ b/services/core/java/com/android/server/pm/IPackageManagerBase.java
@@ -905,12 +905,6 @@
@Override
@Deprecated
- public final boolean isOnlyCoreApps() {
- return mService.isOnlyCoreApps();
- }
-
- @Override
- @Deprecated
public final boolean isPackageAvailable(String packageName, int userId) {
return snapshot().isPackageAvailable(packageName, userId);
}
diff --git a/services/core/java/com/android/server/pm/InitAppsHelper.java b/services/core/java/com/android/server/pm/InitAppsHelper.java
index 1b4c981..c1e3c75 100644
--- a/services/core/java/com/android/server/pm/InitAppsHelper.java
+++ b/services/core/java/com/android/server/pm/InitAppsHelper.java
@@ -81,7 +81,6 @@
/* Track of the number of system apps */
private int mSystemPackagesCount;
private final boolean mIsDeviceUpgrading;
- private final boolean mIsOnlyCoreApps;
private final List<ScanPartition> mSystemPartitions;
/**
@@ -108,7 +107,6 @@
mSystemPartitions = systemPartitions;
mDirsToScanAsSystem = getSystemScanPartitions();
mIsDeviceUpgrading = mPm.isDeviceUpgrading();
- mIsOnlyCoreApps = mPm.isOnlyCoreApps();
// Set flag to monitor and not change apk file paths when scanning install directories.
int scanFlags = SCAN_BOOTING | SCAN_INITIAL;
if (mIsDeviceUpgrading || mPm.isFirstBoot()) {
@@ -229,12 +227,10 @@
pkg -> consumer.accept(pkg, pkg.isSystem(),
apkInApexPreInstalledPaths.get(pkg.getPackageName()))));
- if (!mIsOnlyCoreApps) {
- // do this first before mucking with mPackages for the "expecting better" case
- updateStubSystemAppsList(mStubSystemApps);
- mInstallPackageHelper.prepareSystemPackageCleanUp(packageSettings,
- mPossiblyDeletedUpdatedSystemApps, mExpectingBetter, userIds);
- }
+ // do this first before mucking with mPackages for the "expecting better" case
+ updateStubSystemAppsList(mStubSystemApps);
+ mInstallPackageHelper.prepareSystemPackageCleanUp(packageSettings,
+ mPossiblyDeletedUpdatedSystemApps, mExpectingBetter, userIds);
logSystemAppsScanningTime(startTime);
return overlayConfig;
@@ -268,23 +264,18 @@
@GuardedBy({"mPm.mInstallLock", "mPm.mLock"})
public void initNonSystemApps(PackageParser2 packageParser, @NonNull int[] userIds,
long startTime) {
- if (!mIsOnlyCoreApps) {
- EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_DATA_SCAN_START,
- SystemClock.uptimeMillis());
- scanDirTracedLI(mPm.getAppInstallDir(), /* frameworkSplits= */ null, 0,
- mScanFlags | SCAN_REQUIRE_KNOWN,
- packageParser, mExecutorService);
- }
+ EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_DATA_SCAN_START,
+ SystemClock.uptimeMillis());
+ scanDirTracedLI(mPm.getAppInstallDir(), /* frameworkSplits= */ null, 0,
+ mScanFlags | SCAN_REQUIRE_KNOWN, packageParser, mExecutorService);
List<Runnable> unfinishedTasks = mExecutorService.shutdownNow();
if (!unfinishedTasks.isEmpty()) {
throw new IllegalStateException("Not all tasks finished before calling close: "
+ unfinishedTasks);
}
- if (!mIsOnlyCoreApps) {
- fixSystemPackages(userIds);
- logNonSystemAppScanningTime(startTime);
- }
+ fixSystemPackages(userIds);
+ logNonSystemAppScanningTime(startTime);
mExpectingBetter.clear();
mPm.mSettings.pruneRenamedPackagesLPw();
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerInternalBase.java b/services/core/java/com/android/server/pm/PackageManagerInternalBase.java
index 3d13db3..3d121e6 100644
--- a/services/core/java/com/android/server/pm/PackageManagerInternalBase.java
+++ b/services/core/java/com/android/server/pm/PackageManagerInternalBase.java
@@ -543,12 +543,6 @@
@Override
@Deprecated
- public final boolean isOnlyCoreApps() {
- return mService.isOnlyCoreApps();
- }
-
- @Override
- @Deprecated
public final void freeStorage(String volumeUuid, long bytes,
@StorageManager.AllocateFlags int flags) throws IOException {
mService.freeStorage(volumeUuid, bytes, flags);
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 1f3e03a..cbe6bdd 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -551,7 +551,6 @@
private final int mSdkVersion;
final Context mContext;
final boolean mFactoryTest;
- private final boolean mOnlyCore;
final DisplayMetrics mMetrics;
private final int mDefParseFlags;
private final String[] mSeparateProcesses;
@@ -1402,7 +1401,7 @@
public static Pair<PackageManagerService, IPackageManager> main(Context context,
Installer installer, @NonNull DomainVerificationService domainVerificationService,
- boolean factoryTest, boolean onlyCore) {
+ boolean factoryTest) {
// Self-check for initial settings.
PackageManagerServiceCompilerMapping.checkProperties();
final TimingsTraceAndSlog t = new TimingsTraceAndSlog(TAG + "Timing",
@@ -1422,8 +1421,7 @@
(i, pm) -> PermissionManagerService.create(context,
i.getSystemConfig().getAvailableFeatures()),
(i, pm) -> new UserManagerService(context, pm,
- new UserDataPreparer(installer, installLock, context, onlyCore),
- lock),
+ new UserDataPreparer(installer, installLock, context), lock),
(i, pm) -> new Settings(Environment.getDataDirectory(),
RuntimePermissionsPersistence.createInstance(),
i.getPermissionManagerServiceInternal(),
@@ -1445,14 +1443,13 @@
(i, pm) -> new DefaultAppProvider(() -> context.getSystemService(RoleManager.class),
() -> LocalServices.getService(UserManagerInternal.class)),
(i, pm) -> new DisplayMetrics(),
- (i, pm) -> new PackageParser2(pm.mSeparateProcesses, pm.mOnlyCore,
- i.getDisplayMetrics(), pm.mCacheDir,
+ (i, pm) -> new PackageParser2(pm.mSeparateProcesses, i.getDisplayMetrics(),
+ pm.mCacheDir,
pm.mPackageParserCallback) /* scanningCachingPackageParserProducer */,
- (i, pm) -> new PackageParser2(pm.mSeparateProcesses, pm.mOnlyCore,
- i.getDisplayMetrics(), null,
+ (i, pm) -> new PackageParser2(pm.mSeparateProcesses, i.getDisplayMetrics(), null,
pm.mPackageParserCallback) /* scanningPackageParserProducer */,
- (i, pm) -> new PackageParser2(pm.mSeparateProcesses, false, i.getDisplayMetrics(),
- null, pm.mPackageParserCallback) /* preparingPackageParserProducer */,
+ (i, pm) -> new PackageParser2(pm.mSeparateProcesses, i.getDisplayMetrics(), null,
+ pm.mPackageParserCallback) /* preparingPackageParserProducer */,
// Prepare a supplier of package parser for the staging manager to parse apex file
// during the staging installation.
(i, pm) -> new PackageInstallerService(
@@ -1480,7 +1477,7 @@
Slog.w(TAG, "**** ro.build.version.sdk not set!");
}
- PackageManagerService m = new PackageManagerService(injector, onlyCore, factoryTest,
+ PackageManagerService m = new PackageManagerService(injector, factoryTest,
PackagePartitions.FINGERPRINT, Build.IS_ENG, Build.IS_USERDEBUG,
Build.VERSION.SDK_INT, Build.VERSION.INCREMENTAL);
t.traceEnd(); // "create package manager"
@@ -1630,7 +1627,6 @@
mMetrics = testParams.Metrics;
mModuleInfoProvider = testParams.moduleInfoProvider;
mMoveCallbacks = testParams.moveCallbacks;
- mOnlyCore = testParams.onlyCore;
mOverlayConfig = testParams.overlayConfig;
mPackageDexOptimizer = testParams.packageDexOptimizer;
mPackageParserCallback = testParams.packageParserCallback;
@@ -1694,9 +1690,9 @@
invalidatePackageInfoCache();
}
- public PackageManagerService(PackageManagerServiceInjector injector, boolean onlyCore,
- boolean factoryTest, final String buildFingerprint, final boolean isEngBuild,
- final boolean isUserDebugBuild, final int sdkVersion, final String incrementalVersion) {
+ public PackageManagerService(PackageManagerServiceInjector injector, boolean factoryTest,
+ final String buildFingerprint, final boolean isEngBuild, final boolean isUserDebugBuild,
+ final int sdkVersion, final String incrementalVersion) {
mIsEngBuild = isEngBuild;
mIsUserDebugBuild = isUserDebugBuild;
mSdkVersion = sdkVersion;
@@ -1718,7 +1714,6 @@
mContext = injector.getContext();
mFactoryTest = factoryTest;
- mOnlyCore = onlyCore;
mMetrics = injector.getDisplayMetrics();
mInstaller = injector.getInstaller();
mEnableFreeCacheV2 = SystemProperties.getBoolean("fw.free_cache_v2", true);
@@ -1918,7 +1913,7 @@
mPermissionManager.readLegacyPermissionsTEMP(mSettings.mPermissions);
mPermissionManager.readLegacyPermissionStateTEMP();
- if (!mOnlyCore && mFirstBoot) {
+ if (mFirstBoot) {
DexOptHelper.requestCopyPreoptedFiles();
}
@@ -2069,21 +2064,19 @@
StorageManager.UUID_PRIVATE_INTERNAL, mIsUpgrade);
ver.sdkVersion = mSdkVersion;
- // If this is the first boot or an update from pre-M, and it is a normal
- // boot, then we need to initialize the default preferred apps across
- // all defined users.
- if (!mOnlyCore && (mPromoteSystemApps || mFirstBoot)) {
+ // If this is the first boot or an update from pre-M, then we need to initialize the
+ // default preferred apps across all defined users.
+ if (mPromoteSystemApps || mFirstBoot) {
for (UserInfo user : mInjector.getUserManagerInternal().getUsers(true)) {
mSettings.applyDefaultPreferredAppsLPw(user.id);
}
}
- // If this is first boot after an OTA, and a normal boot, then
- // we need to clear code cache directories.
+ // If this is first boot after an OTA, then we need to clear code cache directories.
// Note that we do *not* clear the application profiles. These remain valid
// across OTAs and are used to drive profile verification (post OTA) and
// profile compilation (without waiting to collect a fresh set of profiles).
- if (mIsUpgrade && !mOnlyCore) {
+ if (mIsUpgrade) {
Slog.i(TAG, "Build fingerprint changed; clearing code caches");
for (int i = 0; i < packageSettings.size(); i++) {
final PackageSetting ps = packageSettings.valueAt(i);
@@ -2103,7 +2096,7 @@
// Legacy existing (installed before Q) non-system apps to hide
// their icons in launcher.
- if (!mOnlyCore && mIsPreQUpgrade) {
+ if (mIsPreQUpgrade) {
Slog.i(TAG, "Allowlisting all existing apps to hide their icons");
int size = packageSettings.size();
for (int i = 0; i < size; i++) {
@@ -2129,33 +2122,25 @@
EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_READY,
SystemClock.uptimeMillis());
- if (!mOnlyCore) {
- mRequiredVerifierPackage = getRequiredButNotReallyRequiredVerifierLPr(computer);
- mRequiredInstallerPackage = getRequiredInstallerLPr(computer);
- mRequiredUninstallerPackage = getRequiredUninstallerLPr(computer);
- ComponentName intentFilterVerifierComponent =
- getIntentFilterVerifierComponentNameLPr(computer);
- ComponentName domainVerificationAgent =
- getDomainVerificationAgentComponentNameLPr(computer);
+ mRequiredVerifierPackage = getRequiredButNotReallyRequiredVerifierLPr(computer);
+ mRequiredInstallerPackage = getRequiredInstallerLPr(computer);
+ mRequiredUninstallerPackage = getRequiredUninstallerLPr(computer);
+ ComponentName intentFilterVerifierComponent =
+ getIntentFilterVerifierComponentNameLPr(computer);
+ ComponentName domainVerificationAgent =
+ getDomainVerificationAgentComponentNameLPr(computer);
- DomainVerificationProxy domainVerificationProxy = DomainVerificationProxy.makeProxy(
- intentFilterVerifierComponent, domainVerificationAgent, mContext,
- mDomainVerificationManager, mDomainVerificationManager.getCollector(),
- mDomainVerificationConnection);
+ DomainVerificationProxy domainVerificationProxy = DomainVerificationProxy.makeProxy(
+ intentFilterVerifierComponent, domainVerificationAgent, mContext,
+ mDomainVerificationManager, mDomainVerificationManager.getCollector(),
+ mDomainVerificationConnection);
- mDomainVerificationManager.setProxy(domainVerificationProxy);
+ mDomainVerificationManager.setProxy(domainVerificationProxy);
- mServicesExtensionPackageName = getRequiredServicesExtensionPackageLPr(computer);
- mSharedSystemSharedLibraryPackageName = getRequiredSharedLibrary(computer,
- PackageManager.SYSTEM_SHARED_LIBRARY_SHARED,
- SharedLibraryInfo.VERSION_UNDEFINED);
- } else {
- mRequiredVerifierPackage = null;
- mRequiredInstallerPackage = null;
- mRequiredUninstallerPackage = null;
- mServicesExtensionPackageName = null;
- mSharedSystemSharedLibraryPackageName = null;
- }
+ mServicesExtensionPackageName = getRequiredServicesExtensionPackageLPr(computer);
+ mSharedSystemSharedLibraryPackageName = getRequiredSharedLibrary(computer,
+ PackageManager.SYSTEM_SHARED_LIBRARY_SHARED,
+ SharedLibraryInfo.VERSION_UNDEFINED);
// PermissionController hosts default permission granting and role management, so it's a
// critical part of the core system.
@@ -2271,11 +2256,6 @@
return mFirstBoot;
}
- public boolean isOnlyCoreApps() {
- // allow instant applications
- return mOnlyCore;
- }
-
public boolean isDeviceUpgrading() {
// allow instant applications
// The system property allows testing ota flow when upgraded to the same image.
diff --git a/services/core/java/com/android/server/pm/UserDataPreparer.java b/services/core/java/com/android/server/pm/UserDataPreparer.java
index 95482d7..3f68642 100644
--- a/services/core/java/com/android/server/pm/UserDataPreparer.java
+++ b/services/core/java/com/android/server/pm/UserDataPreparer.java
@@ -54,13 +54,11 @@
private final Object mInstallLock;
private final Context mContext;
- private final boolean mOnlyCore;
private final Installer mInstaller;
- UserDataPreparer(Installer installer, Object installLock, Context context, boolean onlyCore) {
+ UserDataPreparer(Installer installer, Object installLock, Context context) {
mInstallLock = installLock;
mContext = context;
- mOnlyCore = onlyCore;
mInstaller = installer;
}
@@ -85,13 +83,13 @@
try {
storage.prepareUserStorage(volumeUuid, userId, userSerial, flags);
- if ((flags & StorageManager.FLAG_STORAGE_DE) != 0 && !mOnlyCore) {
+ if ((flags & StorageManager.FLAG_STORAGE_DE) != 0) {
enforceSerialNumber(getDataUserDeDirectory(volumeUuid, userId), userSerial);
if (Objects.equals(volumeUuid, StorageManager.UUID_PRIVATE_INTERNAL)) {
enforceSerialNumber(getDataSystemDeDirectory(userId), userSerial);
}
}
- if ((flags & StorageManager.FLAG_STORAGE_CE) != 0 && !mOnlyCore) {
+ if ((flags & StorageManager.FLAG_STORAGE_CE) != 0) {
enforceSerialNumber(getDataUserCeDirectory(volumeUuid, userId), userSerial);
if (Objects.equals(volumeUuid, StorageManager.UUID_PRIVATE_INTERNAL)) {
enforceSerialNumber(getDataSystemCeDirectory(userId), userSerial);
@@ -217,7 +215,7 @@
logCriticalInfo(Log.WARN, "Destroying user directory " + file
+ " because no matching user was found");
destroyUser = true;
- } else if (!mOnlyCore) {
+ } else {
try {
enforceSerialNumber(file, info.serialNumber);
} catch (IOException e) {
diff --git a/services/core/java/com/android/server/pm/parsing/PackageParser2.java b/services/core/java/com/android/server/pm/parsing/PackageParser2.java
index b2e15e7..e0d5aec 100644
--- a/services/core/java/com/android/server/pm/parsing/PackageParser2.java
+++ b/services/core/java/com/android/server/pm/parsing/PackageParser2.java
@@ -65,8 +65,8 @@
public static PackageParser2 forParsingFileWithDefaults() {
IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface(
ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));
- return new PackageParser2(null /* separateProcesses */, false /* onlyCoreApps */,
- null /* displayMetrics */, null /* cacheDir */, new Callback() {
+ return new PackageParser2(null /* separateProcesses */, null /* displayMetrics */,
+ null /* cacheDir */, new Callback() {
@Override
public boolean isChangeEnabled(long changeId, @NonNull ApplicationInfo appInfo) {
try {
@@ -108,13 +108,8 @@
private ParsingPackageUtils parsingUtils;
- /**
- * @param onlyCoreApps Flag indicating this parser should only consider apps with
- * {@code coreApp} manifest attribute to be valid apps. This is useful when
- * creating a minimalist boot environment.
- */
- public PackageParser2(String[] separateProcesses, boolean onlyCoreApps,
- DisplayMetrics displayMetrics, @Nullable File cacheDir, @NonNull Callback callback) {
+ public PackageParser2(String[] separateProcesses, DisplayMetrics displayMetrics,
+ @Nullable File cacheDir, @NonNull Callback callback) {
if (displayMetrics == null) {
displayMetrics = new DisplayMetrics();
displayMetrics.setToDefaults();
@@ -127,8 +122,8 @@
mCacher = cacheDir == null ? null : new PackageCacher(cacheDir);
- parsingUtils = new ParsingPackageUtils(onlyCoreApps, separateProcesses, displayMetrics,
- splitPermissions, callback);
+ parsingUtils = new ParsingPackageUtils(separateProcesses, displayMetrics, splitPermissions,
+ callback);
ParseInput.Callback enforcementCallback = (changeId, packageName, targetSdkVersion) -> {
ApplicationInfo appInfo = mSharedAppInfo.get();
diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
index 9897c42..10e8e37 100644
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
@@ -23,7 +23,6 @@
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES;
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NOT_APK;
-import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_ONLY_COREAPP_ALLOWED;
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_RESOURCES_ARSC_COMPRESSED;
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;
import static android.os.Build.VERSION_CODES.DONUT;
@@ -283,7 +282,7 @@
boolean collectCertificates) {
ParseResult<ParsingPackage> result;
- ParsingPackageUtils parser = new ParsingPackageUtils(false, null /*separateProcesses*/,
+ ParsingPackageUtils parser = new ParsingPackageUtils(null /*separateProcesses*/,
null /*displayMetrics*/, splitPermissions, new Callback() {
@Override
public boolean hasFeature(String feature) {
@@ -324,18 +323,15 @@
return input.success(pkg);
}
- private boolean mOnlyCoreApps;
private String[] mSeparateProcesses;
private DisplayMetrics mDisplayMetrics;
@NonNull
private List<PermissionManager.SplitPermissionInfo> mSplitPermissionInfos;
private Callback mCallback;
- public ParsingPackageUtils(boolean onlyCoreApps, String[] separateProcesses,
- DisplayMetrics displayMetrics,
+ public ParsingPackageUtils(String[] separateProcesses, DisplayMetrics displayMetrics,
@NonNull List<PermissionManager.SplitPermissionInfo> splitPermissions,
@NonNull Callback callback) {
- mOnlyCoreApps = onlyCoreApps;
mSeparateProcesses = separateProcesses;
mDisplayMetrics = displayMetrics;
mSplitPermissionInfos = splitPermissions;
@@ -400,11 +396,6 @@
}
final PackageLite lite = liteResult.getResult();
- if (mOnlyCoreApps && !lite.isCoreApp()) {
- return input.error(INSTALL_PARSE_FAILED_ONLY_COREAPP_ALLOWED,
- "Not a coreApp: " + packageDir);
- }
-
// Build the split dependency tree.
SparseArray<int[]> splitDependencies = null;
final SplitAssetLoader assetLoader;
@@ -472,11 +463,6 @@
}
final PackageLite lite = liteResult.getResult();
- if (mOnlyCoreApps && !lite.isCoreApp()) {
- return input.error(INSTALL_PARSE_FAILED_ONLY_COREAPP_ALLOWED,
- "Not a coreApp: " + apkFile);
- }
-
final SplitAssetLoader assetLoader = new DefaultSplitAssetLoader(lite, flags);
try {
final ParseResult<ParsingPackage> result = parseBaseApk(input,
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 4cfb479..d4a43d3 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1218,7 +1218,7 @@
Watchdog.getInstance().pauseWatchingCurrentThread("packagemanagermain");
Pair<PackageManagerService, IPackageManager> pmsPair = PackageManagerService.main(
mSystemContext, installer, domainVerificationService,
- mFactoryTestMode != FactoryTest.FACTORY_TEST_OFF, /* onlyCore= */ false);
+ mFactoryTestMode != FactoryTest.FACTORY_TEST_OFF);
mPackageManagerService = pmsPair.first;
iPackageManager = pmsPair.second;
} finally {
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/DeletePackageHelperTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/DeletePackageHelperTest.kt
index c9598bd..9b4d967 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/DeletePackageHelperTest.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/DeletePackageHelperTest.kt
@@ -59,7 +59,6 @@
private fun createPackageManagerService(): PackageManagerService {
return spy(PackageManagerService(rule.mocks().injector,
- false /*coreOnly*/,
false /*factoryTest*/,
MockSystem.DEFAULT_VERSION_INFO.fingerprint,
false /*isEngBuild*/,
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/PackageFreezerTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/PackageFreezerTest.kt
index fbbb814..4d13981 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/PackageFreezerTest.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/PackageFreezerTest.kt
@@ -53,7 +53,6 @@
rule.system().dataAppDirectory)
}
var pms = PackageManagerService(rule.mocks().injector,
- false /*coreOnly*/,
false /*factoryTest*/,
MockSystem.DEFAULT_VERSION_INFO.fingerprint,
false /*isEngBuild*/,
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/PackageHelperTestBase.kt b/services/tests/mockingservicestests/src/com/android/server/pm/PackageHelperTestBase.kt
index f48d16f..f9baab9 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/PackageHelperTestBase.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/PackageHelperTestBase.kt
@@ -131,7 +131,6 @@
rule.system().dataAppDirectory)
}
var pms = PackageManagerService(rule.mocks().injector,
- false /* coreOnly */,
false /* factoryTest */,
MockSystem.DEFAULT_VERSION_INFO.fingerprint,
false /* isEngBuild */,
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceBootTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceBootTest.kt
index bbca121..c9b36f0 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceBootTest.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceBootTest.kt
@@ -57,7 +57,6 @@
private fun createPackageManagerService(): PackageManagerService {
return PackageManagerService(rule.mocks().injector,
- false /*coreOnly*/,
false /*factoryTest*/,
MockSystem.DEFAULT_VERSION_INFO.fingerprint,
false /*isEngBuild*/,
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt b/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt
index 537a028..b9893f6 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt
@@ -165,7 +165,6 @@
private fun createPackageManagerService(): PackageManagerService {
return PackageManagerService(rule.mocks().injector,
- false /*coreOnly*/,
false /*factoryTest*/,
MockSystem.DEFAULT_VERSION_INFO.fingerprint,
false /*isEngBuild*/,
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt
index bd36322..b42a3b0 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt
@@ -104,7 +104,6 @@
stageScanExistingPackages()
mPms = spy(PackageManagerService(mMockSystem.mocks().injector,
- false /*coreOnly*/,
false /*factoryTest*/,
MockSystem.DEFAULT_VERSION_INFO.fingerprint,
false /*isEngBuild*/,
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java
index 952200d..bbf0db4 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java
@@ -603,7 +603,7 @@
public static class CachePackageNameParser extends PackageParser2 {
CachePackageNameParser(@Nullable File cacheDir) {
- super(null, false, null, null, new Callback() {
+ super(null, null, null, new Callback() {
@Override
public boolean isChangeEnabled(long changeId, @NonNull ApplicationInfo appInfo) {
return true;
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java
index c489cf0..7ab4e8c 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java
@@ -82,7 +82,7 @@
FileUtils.deleteContents(ctx.getCacheDir());
mInstallLock = new Object();
MockitoAnnotations.initMocks(this);
- mUserDataPreparer = new TestUserDataPreparer(mInstaller, mInstallLock, mContextMock, false,
+ mUserDataPreparer = new TestUserDataPreparer(mInstaller, mInstallLock, mContextMock,
ctx.getCacheDir());
when(mContextMock.getSystemServiceName(StorageManager.class))
.thenReturn(Context.STORAGE_SERVICE);
@@ -215,8 +215,8 @@
File testDir;
TestUserDataPreparer(Installer installer, Object installLock, Context context,
- boolean onlyCore, File testDir) {
- super(installer, installLock, context, onlyCore);
+ File testDir) {
+ super(installer, installLock, context);
this.testDir = testDir;
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/TestPackageParser2.kt b/services/tests/servicestests/src/com/android/server/pm/parsing/TestPackageParser2.kt
index 7ca7682..6ee91b8 100644
--- a/services/tests/servicestests/src/com/android/server/pm/parsing/TestPackageParser2.kt
+++ b/services/tests/servicestests/src/com/android/server/pm/parsing/TestPackageParser2.kt
@@ -18,8 +18,8 @@
import android.content.pm.ApplicationInfo
-class TestPackageParser2 : PackageParser2(null /* separateProcesses */, false /* onlyCoreApps */,
- null /* displayMetrics */, null /* cacheDir */, object : PackageParser2.Callback() {
+class TestPackageParser2 : PackageParser2(null /* separateProcesses */, null /* displayMetrics */,
+ null /* cacheDir */, object : PackageParser2.Callback() {
override fun isChangeEnabled(changeId: Long, appInfo: ApplicationInfo): Boolean {
return true
}