Merge "Gather known packages earlier during boot." (ce023fae) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -2088,6 +2088,14 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		mInitAppsHelper.initNonSystemApps(packageParser, userIds, startTime);
		packageParser.close();

		mRequiredVerifierPackages = getRequiredButNotReallyRequiredVerifiersLPr(computer);
		mRequiredInstallerPackage = getRequiredInstallerLPr(computer);
		mRequiredUninstallerPackage = getRequiredUninstallerLPr(computer);

		// PermissionController hosts default permission granting and role management, so it's a
		// critical part of the core system.
		mRequiredPermissionControllerPackage = getRequiredPermissionControllerLPr(computer);

		// Resolve the storage manager.
		mStorageManagerPackage = getStorageManagerPackageName(computer);

		@@ -2233,9 +2241,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_READY,
		SystemClock.uptimeMillis());

		mRequiredVerifierPackages = getRequiredButNotReallyRequiredVerifiersLPr(computer);
		mRequiredInstallerPackage = getRequiredInstallerLPr(computer);
		mRequiredUninstallerPackage = getRequiredUninstallerLPr(computer);
		ComponentName intentFilterVerifierComponent =
		getIntentFilterVerifierComponentNameLPr(computer);
		ComponentName domainVerificationAgent =
		@@ -2253,10 +2258,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		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.
		mRequiredPermissionControllerPackage = getRequiredPermissionControllerLPr(computer);

		mSettings.setPermissionControllerVersion(
		computer.getPackageInfo(mRequiredPermissionControllerPackage, 0,
		UserHandle.USER_SYSTEM).getLongVersionCode());