Merge "Always mark package as "uninstalled" for all new users." into main (403a5df8) · Commits · e / os / android_frameworks_base

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

+16 −8

Original line number	Diff line number	Diff line
		@@ -1541,6 +1541,19 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		return;
		}

		// Initialize all necessary settings for archival installation.
		pkgSetting
		// No package.
		.setPkg(null)
		// Mark for later restore.
		.setPendingRestore(true);
		for (int userId : userIds) {
		// Unmark "installed" for all users.
		pkgSetting
		.modifyUserState(userId)
		.setInstalled(false);
		}

		String responsibleInstallerPackage = PackageArchiver.getResponsibleInstallerPackage(
		pkgSetting);
		// TODO(b/278553670) Check if responsibleInstallerPackage supports unarchival.
		@@ -1551,18 +1564,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		for (int userId : userIds) {
		var archiveState = mInstallerService.mPackageArchiver.createArchiveState(
		archivePackage, userId, responsibleInstallerPackage);
		if (archiveState == null) {
		continue;
		}
		if (archiveState != null) {
		pkgSetting
		.setPkg(null)
		// This package was installed as archived. Need to mark it for later restore.
		.setPendingRestore(true)
		.modifyUserState(userId)
		.setInstalled(false)
		.setArchiveState(archiveState);
		}
		}
		}


		void scheduleWriteSettings() {