Merge "Begins refactoring delete into test and execute steps" (332849b5) · Commits · e / os / android_frameworks_base

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

+49 −28

Original line number	Diff line number	Diff line
		@@ -17773,30 +17773,58 @@ public class PackageManagerService extends IPackageManager.Stub
		return true;
		}

		private static class DeletePackageAction {
		public final PackageSetting deletingPs;

		private DeletePackageAction(PackageSetting deletingPs) {
		this.deletingPs = deletingPs;
		}
		}

		/**
		* @return a {@link DeletePackageAction} if the provided package may be deleted, {@code null}
		* otherwise.
		*/
		@Nullable
		private DeletePackageAction mayDeletePackageLIF(@NonNull String packageName) {
		synchronized (mPackages) {
		final PackageSetting ps;
		ps = mSettings.mPackages.get(packageName);
		if (ps == null) {
		return null;
		}
		return new DeletePackageAction(ps);
		}
		}

		/*
		* This method handles package deletion in general
		*/
		private boolean deletePackageLIF(String packageName, UserHandle user,
		private boolean deletePackageLIF(@NonNull String packageName, UserHandle user,
		boolean deleteCodeAndResources, int[] allUserHandles, int flags,
		PackageRemovedInfo outInfo, boolean writeSettings,
		PackageParser.Package replacingPackage) {
		if (packageName == null) {
		Slog.w(TAG, "Attempt to delete null packageName.");
		final DeletePackageAction action = mayDeletePackageLIF(packageName);
		if (null == action) {
		return false;
		}

		if (DEBUG_REMOVE) Slog.d(TAG, "deletePackageLI: " + packageName + " user " + user);

		PackageSetting ps;
		synchronized (mPackages) {
		ps = mSettings.mPackages.get(packageName);
		if (ps == null) {
		Slog.w(TAG, "Package named '" + packageName + "' doesn't exist.");
		return false;
		return executeDeletePackageLIF(action, packageName, user, deleteCodeAndResources,
		allUserHandles, flags, outInfo, writeSettings, replacingPackage);
		}

		if (ps.parentPackageName != null && (!isSystemApp(ps)
		\|\| (flags & PackageManager.DELETE_SYSTEM_APP) != 0)) {
		private boolean executeDeletePackageLIF(DeletePackageAction action,
		String packageName, UserHandle user, boolean deleteCodeAndResources,
		int[] allUserHandles, int flags, PackageRemovedInfo outInfo,
		boolean writeSettings, PackageParser.Package replacingPackage) {
		final PackageSetting ps = action.deletingPs;
		final boolean systemApp = isSystemApp(ps);
		synchronized (mPackages) {

		if (ps.parentPackageName != null
		&& (!systemApp \|\| (flags & PackageManager.DELETE_SYSTEM_APP) != 0)) {
		if (DEBUG_REMOVE) {
		Slog.d(TAG, "Uninstalled child package:" + packageName + " for user:"
		+ ((user == null) ? UserHandle.USER_ALL : user));
		@@ -17804,9 +17832,7 @@ public class PackageManagerService extends IPackageManager.Stub
		final int removedUserId = (user != null) ? user.getIdentifier()
		: UserHandle.USER_ALL;

		if (!clearPackageStateForUserLIF(ps, removedUserId, outInfo)) {
		return false;
		}
		clearPackageStateForUserLIF(ps, removedUserId, outInfo);
		markPackageUninstalledForUserLPw(ps, user);
		scheduleWritePackageRestrictionsLocked(user);
		return true;
		@@ -17819,7 +17845,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}


		if (((!isSystemApp(ps) \|\| (flags&PackageManager.DELETE_SYSTEM_APP) != 0) && user != null
		if (((!systemApp \|\| (flags & PackageManager.DELETE_SYSTEM_APP) != 0) && user != null
		&& user.getIdentifier() != UserHandle.USER_ALL)) {
		// The caller is asking that the package only be deleted for a single
		// user. To do this, we just mark its uninstalled state and delete
		@@ -17828,7 +17854,7 @@ public class PackageManagerService extends IPackageManager.Stub
		// semantics than normal for uninstalling system apps.
		markPackageUninstalledForUserLPw(ps, user);

		if (!isSystemApp(ps)) {
		if (!systemApp) {
		// Do not uninstall the APK if an app should be cached
		boolean keepUninstalledPackage = shouldKeepUninstalledPackageLPr(packageName);
		if (ps.isAnyInstalled(sUserManager.getUserIds()) \|\| keepUninstalledPackage) {
		@@ -17836,9 +17862,7 @@ public class PackageManagerService extends IPackageManager.Stub
		// we need to do is clear this user's data and save that
		// it is uninstalled.
		if (DEBUG_REMOVE) Slog.d(TAG, "Still installed by other users");
		if (!clearPackageStateForUserLIF(ps, user.getIdentifier(), outInfo)) {
		return false;
		}
		clearPackageStateForUserLIF(ps, user.getIdentifier(), outInfo);
		scheduleWritePackageRestrictionsLocked(user);
		return true;
		} else {
		@@ -17854,9 +17878,7 @@ public class PackageManagerService extends IPackageManager.Stub
		// we need to do is clear this user's data and save that
		// it is uninstalled.
		if (DEBUG_REMOVE) Slog.d(TAG, "Deleting system app");
		if (!clearPackageStateForUserLIF(ps, user.getIdentifier(), outInfo)) {
		return false;
		}
		clearPackageStateForUserLIF(ps, user.getIdentifier(), outInfo);
		scheduleWritePackageRestrictionsLocked(user);
		return true;
		}
		@@ -17882,8 +17904,9 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		boolean ret = false;
		if (isSystemApp(ps)) {
		// TODO(b/109941548): break reasons for ret = false out into mayDelete method
		final boolean ret;
		if (systemApp) {
		if (DEBUG_REMOVE) Slog.d(TAG, "Removing system package: " + ps.name);
		// When an updated system application is deleted we delete the existing resources
		// as well and fall back to existing code in system partition
		@@ -17912,7 +17935,7 @@ public class PackageManagerService extends IPackageManager.Stub
		// If we uninstalled an update to a system app there may be some
		// child packages that appeared as they are declared in the system
		// app but were not declared in the update.
		if (isSystemApp(ps)) {
		if (systemApp) {
		synchronized (mPackages) {
		PackageSetting updatedPs = mSettings.getPackageLPr(ps.name);
		final int childCount = (updatedPs.childPackageNames != null)
		@@ -17973,7 +17996,7 @@ public class PackageManagerService extends IPackageManager.Stub
		mSettings.writeKernelMappingLPr(ps);
		}

		private boolean clearPackageStateForUserLIF(PackageSetting ps, int userId,
		private void clearPackageStateForUserLIF(PackageSetting ps, int userId,
		PackageRemovedInfo outInfo) {
		final PackageParser.Package pkg;
		synchronized (mPackages) {
		@@ -18009,8 +18032,6 @@ public class PackageManagerService extends IPackageManager.Stub
		outInfo.removedUsers = userIds;
		outInfo.broadcastUsers = userIds;
		}

		return true;
		}

		@Override