[pm] another installation helper (7dd5f1e0) · Commits · e / os / android_frameworks_base

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

+14 −5

Original line number	Diff line number	Diff line
		@@ -62,12 +62,21 @@ final class AppDataHelper {
		private final PackageManagerService mPm;
		private final Installer mInstaller;
		private final ArtManagerService mArtManagerService;
		private final PackageManagerServiceInjector mInjector;

		// TODO(b/198166813): remove PMS dependency
		AppDataHelper(PackageManagerService pm) {
		mPm = pm;
		mInstaller = mPm.mInjector.getInstaller();
		mArtManagerService = mPm.mInjector.getArtManagerService();
		mInjector = mPm.mInjector;
		mInstaller = mInjector.getInstaller();
		mArtManagerService = mInjector.getArtManagerService();
		}

		AppDataHelper(PackageManagerService pm, PackageManagerServiceInjector injector) {
		mPm = pm;
		mInjector = injector;
		mInstaller = injector.getInstaller();
		mArtManagerService = injector.getArtManagerService();
		}

		/**
		@@ -90,8 +99,8 @@ final class AppDataHelper {
		}

		Installer.Batch batch = new Installer.Batch();
		UserManagerInternal umInternal = mPm.mInjector.getUserManagerInternal();
		StorageManagerInternal smInternal = mPm.mInjector.getLocalService(
		UserManagerInternal umInternal = mInjector.getUserManagerInternal();
		StorageManagerInternal smInternal = mInjector.getLocalService(
		StorageManagerInternal.class);
		for (UserInfo user : umInternal.getUsers(false /excludeDying/)) {
		final int flags;
		@@ -313,7 +322,7 @@ final class AppDataHelper {
		*/
		@NonNull
		public void reconcileAppsData(int userId, int flags, boolean migrateAppsData) {
		final StorageManager storage = mPm.mInjector.getSystemService(StorageManager.class);
		final StorageManager storage = mInjector.getSystemService(StorageManager.class);
		for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
		final String volumeUuid = vol.getFsUuid();
		synchronized (mPm.mInstallLock) {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1811,7 +1811,7 @@ public class ComputerEngine implements Computer {

		@Nullable
		public final SharedLibraryInfo getSharedLibraryInfoLPr(String name, long version) {
		return PackageManagerService.getSharedLibraryInfo(
		return SharedLibraryHelper.getSharedLibraryInfo(
		name, version, mSharedLibraries, null);
		}

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

+90 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.ApplicationPackageManager;
		import android.content.Intent;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageDeleteObserver2;
		import android.content.pm.PackageChangeEvent;
		import android.content.pm.PackageInstaller;
		@@ -50,6 +51,7 @@ import android.os.Process;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.text.TextUtils;
		import android.util.EventLog;
		import android.util.Log;
		import android.util.Slog;
		@@ -73,6 +75,7 @@ import java.util.List;
		* Relies on RemovePackageHelper to clear internal data structures.
		*/
		final class DeletePackageHelper {
		private static final boolean DEBUG_CLEAN_APKS = false;
		// ------- apps on sdcard specific code -------
		private static final boolean DEBUG_SD_INSTALL = false;

		@@ -509,9 +512,9 @@ final class DeletePackageHelper {

		// Delete application code and resources only for parent packages
		if (deleteCodeAndResources && (outInfo != null)) {
		outInfo.mArgs = mPm.createInstallArgsForExisting(
		outInfo.mArgs = new FileInstallArgs(
		ps.getPathString(), getAppDexInstructionSets(
		ps.getPrimaryCpuAbi(), ps.getSecondaryCpuAbi()));
		ps.getPrimaryCpuAbi(), ps.getSecondaryCpuAbi()), mPm);
		if (DEBUG_SD_INSTALL) Slog.i(TAG, "args=" + outInfo.mArgs);
		}
		}
		@@ -811,4 +814,89 @@ final class DeletePackageHelper {
		this.installed = installed;
		}
		}

		/**
		* We're removing userId and would like to remove any downloaded packages
		* that are no longer in use by any other user.
		* @param userId the user being removed
		*/
		@GuardedBy("mPm.mLock")
		public void removeUnusedPackagesLPw(UserManagerService userManager, final int userId) {
		int [] users = userManager.getUserIds();
		final int numPackages = mPm.mSettings.getPackagesLocked().size();
		for (int index = 0; index < numPackages; index++) {
		final PackageSetting ps = mPm.mSettings.getPackagesLocked().valueAt(index);
		if (ps.getPkg() == null) {
		continue;
		}
		final String packageName = ps.getPkg().getPackageName();
		// Skip over if system app or static shared library
		if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0
		\|\| !TextUtils.isEmpty(ps.getPkg().getStaticSharedLibName())) {
		continue;
		}
		if (DEBUG_CLEAN_APKS) {
		Slog.i(TAG, "Checking package " + packageName);
		}
		boolean keep = mPm.shouldKeepUninstalledPackageLPr(packageName);
		if (keep) {
		if (DEBUG_CLEAN_APKS) {
		Slog.i(TAG, " Keeping package " + packageName + " - requested by DO");
		}
		} else {
		for (int i = 0; i < users.length; i++) {
		if (users[i] != userId && ps.getInstalled(users[i])) {
		keep = true;
		if (DEBUG_CLEAN_APKS) {
		Slog.i(TAG, " Keeping package " + packageName + " for user "
		+ users[i]);
		}
		break;
		}
		}
		}
		if (!keep) {
		if (DEBUG_CLEAN_APKS) {
		Slog.i(TAG, " Removing package " + packageName);
		}
		//end run
		mPm.mHandler.post(() -> deletePackageX(
		packageName, PackageManager.VERSION_CODE_HIGHEST,
		userId, 0, true /removedBySystem/));
		}
		}
		}

		public void deleteExistingPackageAsUser(VersionedPackage versionedPackage,
		final IPackageDeleteObserver2 observer, final int userId) {
		mPm.mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.DELETE_PACKAGES, null);
		Preconditions.checkNotNull(versionedPackage);
		Preconditions.checkNotNull(observer);
		final String packageName = versionedPackage.getPackageName();
		final long versionCode = versionedPackage.getLongVersionCode();

		int installedForUsersCount = 0;
		synchronized (mPm.mLock) {
		// Normalize package name to handle renamed packages and static libs
		final String internalPkgName = mPm.resolveInternalPackageNameLPr(packageName,
		versionCode);
		final PackageSetting ps = mPm.mSettings.getPackageLPr(internalPkgName);
		if (ps != null) {
		int[] installedUsers = ps.queryInstalledUsers(mUserManagerInternal.getUserIds(),
		true);
		installedForUsersCount = installedUsers.length;
		}
		}

		if (installedForUsersCount > 1) {
		deletePackageVersionedInternal(versionedPackage, observer, userId, 0, true);
		} else {
		try {
		observer.onPackageDeleted(packageName, PackageManager.DELETE_FAILED_INTERNAL_ERROR,
		null);
		} catch (RemoteException re) {
		}
		}
		}
		}

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

0 → 100644

+757 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,10 @@ class FileInstallArgs extends InstallArgs {
		super(params);
		}

		/** Existing install */
		/**
		* Create args that describe an existing installed package. Typically used
		* when cleaning up old installs, or used as a move source.
		*/
		FileInstallArgs(String codePath, String[] instructionSets, PackageManagerService pm) {
		super(OriginInfo.fromNothing(), null, null, 0, InstallSource.EMPTY,
		null, null, instructionSets, null, null, null, MODE_DEFAULT, null, 0,