Merge "[pm] refactor to extract more installation logic" (bf0a5404) · Commits · e / os / android_frameworks_base

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

+147 −1

Original line number	Diff line number	Diff line
		@@ -16,20 +16,35 @@

		package com.android.server.pm;

		import static android.content.pm.PackageManager.INSTALL_FAILED_VERSION_DOWNGRADE;

		import android.annotation.NonNull;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageInfoLite;
		import android.content.pm.PackageManager;
		import android.os.UserHandle;
		import android.util.Pair;
		import android.util.Slog;

		import static com.android.server.pm.PackageManagerService.DEBUG_INSTALL;
		import static com.android.server.pm.PackageManagerService.TAG;

		import com.android.internal.util.ArrayUtils;
		import com.android.server.pm.parsing.pkg.AndroidPackage;

		abstract class HandlerParams {
		/** User handle for the user requesting the information or installation. */
		private final UserHandle mUser;
		String mTraceMethod;
		int mTraceCookie;
		@NonNull
		final PackageManagerService mPm;

		HandlerParams(UserHandle user) {
		// TODO(b/198166813): remove PMS dependency
		HandlerParams(UserHandle user, PackageManagerService pm) {
		mUser = user;
		mPm = pm;
		}

		UserHandle getUser() {
		@@ -54,4 +69,135 @@ abstract class HandlerParams {

		abstract void handleStartCopy();
		abstract void handleReturnCode();

		Pair<Integer, String> verifyReplacingVersionCode(PackageInfoLite pkgLite,
		long requiredInstalledVersionCode, int installFlags) {
		if ((installFlags & PackageManager.INSTALL_APEX) != 0) {
		return verifyReplacingVersionCodeForApex(
		pkgLite, requiredInstalledVersionCode, installFlags);
		}

		String packageName = pkgLite.packageName;
		synchronized (mPm.mLock) {
		// Package which currently owns the data that the new package will own if installed.
		// If an app is uninstalled while keeping data (e.g. adb uninstall -k), installedPkg
		// will be null whereas dataOwnerPkg will contain information about the package
		// which was uninstalled while keeping its data.
		AndroidPackage dataOwnerPkg = mPm.mPackages.get(packageName);
		if (dataOwnerPkg == null) {
		PackageSetting ps = mPm.mSettings.getPackageLPr(packageName);
		if (ps != null) {
		dataOwnerPkg = ps.pkg;
		}
		}

		if (requiredInstalledVersionCode != PackageManager.VERSION_CODE_HIGHEST) {
		if (dataOwnerPkg == null) {
		String errorMsg = "Required installed version code was "
		+ requiredInstalledVersionCode
		+ " but package is not installed";
		Slog.w(TAG, errorMsg);
		return Pair.create(
		PackageManager.INSTALL_FAILED_WRONG_INSTALLED_VERSION, errorMsg);
		}

		if (dataOwnerPkg.getLongVersionCode() != requiredInstalledVersionCode) {
		String errorMsg = "Required installed version code was "
		+ requiredInstalledVersionCode
		+ " but actual installed version is "
		+ dataOwnerPkg.getLongVersionCode();
		Slog.w(TAG, errorMsg);
		return Pair.create(
		PackageManager.INSTALL_FAILED_WRONG_INSTALLED_VERSION, errorMsg);
		}
		}

		if (dataOwnerPkg != null) {
		if (!PackageManagerServiceUtils.isDowngradePermitted(installFlags,
		dataOwnerPkg.isDebuggable())) {
		try {
		checkDowngrade(dataOwnerPkg, pkgLite);
		} catch (PackageManagerException e) {
		String errorMsg = "Downgrade detected: " + e.getMessage();
		Slog.w(TAG, errorMsg);
		return Pair.create(
		PackageManager.INSTALL_FAILED_VERSION_DOWNGRADE, errorMsg);
		}
		}
		}
		}
		return Pair.create(PackageManager.INSTALL_SUCCEEDED, null);
		}

		private Pair<Integer, String> verifyReplacingVersionCodeForApex(PackageInfoLite pkgLite,
		long requiredInstalledVersionCode, int installFlags) {
		String packageName = pkgLite.packageName;

		final PackageInfo activePackage = mPm.mApexManager.getPackageInfo(packageName,
		ApexManager.MATCH_ACTIVE_PACKAGE);
		if (activePackage == null) {
		String errorMsg = "Attempting to install new APEX package " + packageName;
		Slog.w(TAG, errorMsg);
		return Pair.create(PackageManager.INSTALL_FAILED_PACKAGE_CHANGED, errorMsg);
		}

		final long activeVersion = activePackage.getLongVersionCode();
		if (requiredInstalledVersionCode != PackageManager.VERSION_CODE_HIGHEST
		&& activeVersion != requiredInstalledVersionCode) {
		String errorMsg = "Installed version of APEX package " + packageName
		+ " does not match required. Active version: " + activeVersion
		+ " required: " + requiredInstalledVersionCode;
		Slog.w(TAG, errorMsg);
		return Pair.create(PackageManager.INSTALL_FAILED_WRONG_INSTALLED_VERSION, errorMsg);
		}

		final boolean isAppDebuggable = (activePackage.applicationInfo.flags
		& ApplicationInfo.FLAG_DEBUGGABLE) != 0;
		final long newVersionCode = pkgLite.getLongVersionCode();
		if (!PackageManagerServiceUtils.isDowngradePermitted(installFlags, isAppDebuggable)
		&& newVersionCode < activeVersion) {
		String errorMsg = "Downgrade of APEX package " + packageName
		+ " is not allowed. Active version: " + activeVersion
		+ " attempted: " + newVersionCode;
		Slog.w(TAG, errorMsg);
		return Pair.create(PackageManager.INSTALL_FAILED_VERSION_DOWNGRADE, errorMsg);
		}

		return Pair.create(PackageManager.INSTALL_SUCCEEDED, null);
		}

		/**
		* Check and throw if the given before/after packages would be considered a
		* downgrade.
		*/
		private static void checkDowngrade(AndroidPackage before, PackageInfoLite after)
		throws PackageManagerException {
		if (after.getLongVersionCode() < before.getLongVersionCode()) {
		throw new PackageManagerException(INSTALL_FAILED_VERSION_DOWNGRADE,
		"Update version code " + after.versionCode + " is older than current "
		+ before.getLongVersionCode());
		} else if (after.getLongVersionCode() == before.getLongVersionCode()) {
		if (after.baseRevisionCode < before.getBaseRevisionCode()) {
		throw new PackageManagerException(INSTALL_FAILED_VERSION_DOWNGRADE,
		"Update base revision code " + after.baseRevisionCode
		+ " is older than current " + before.getBaseRevisionCode());
		}

		if (!ArrayUtils.isEmpty(after.splitNames)) {
		for (int i = 0; i < after.splitNames.length; i++) {
		final String splitName = after.splitNames[i];
		final int j = ArrayUtils.indexOf(before.getSplitNames(), splitName);
		if (j != -1) {
		if (after.splitRevisionCodes[i] < before.getSplitRevisionCodes()[j]) {
		throw new PackageManagerException(INSTALL_FAILED_VERSION_DOWNGRADE,
		"Update split " + splitName + " revision code "
		+ after.splitRevisionCodes[i]
		+ " is older than current "
		+ before.getSplitRevisionCodes()[j]);
		}
		}
		}
		}
		}
		}
		}

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

0 → 100644

+1325 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -163,14 +163,12 @@ final class InstallParams extends HandlerParams {
		final int mDataLoaderType;
		final long mRequiredInstalledVersionCode;
		final PackageLite mPackageLite;
		@NonNull final PackageManagerService mPm;

		InstallParams(OriginInfo originInfo, MoveInfo moveInfo, IPackageInstallObserver2 observer,
		int installFlags, InstallSource installSource, String volumeUuid,
		UserHandle user, String packageAbiOverride, PackageLite packageLite,
		PackageManagerService pm) {
		super(user);
		mPm = pm;
		super(user, pm);
		mOriginInfo = originInfo;
		mMoveInfo = moveInfo;
		mObserver = observer;
		@@ -195,8 +193,7 @@ final class InstallParams extends HandlerParams {
		PackageInstaller.SessionParams sessionParams, InstallSource installSource,
		UserHandle user, SigningDetails signingDetails, int installerUid,
		PackageLite packageLite, PackageManagerService pm) {
		super(user);
		mPm = pm;
		super(user, pm);
		mOriginInfo = OriginInfo.fromStagedFile(stagedDir);
		mMoveInfo = null;
		mInstallReason = fixUpInstallReason(
		@@ -373,7 +370,7 @@ final class InstallParams extends HandlerParams {
		// state can change within this delay and hence we need to re-verify certain conditions.
		boolean isStaged = (mInstallFlags & INSTALL_STAGED) != 0;
		if (isStaged) {
		Pair<Integer, String> ret = mPm.verifyReplacingVersionCode(
		Pair<Integer, String> ret = verifyReplacingVersionCode(
		pkgLite, mRequiredInstalledVersionCode, mInstallFlags);
		mRet = ret.first;
		if (mRet != INSTALL_SUCCEEDED) {
		@@ -622,7 +619,7 @@ final class InstallParams extends HandlerParams {
		Map<String, ReconciledPackage> reconciledPackages;
		try {
		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "reconcilePackages");
		reconciledPackages = PackageManagerService.reconcilePackagesLocked(
		reconciledPackages = mPm.reconcilePackagesLocked(
		reconcileRequest, mPm.mSettings.getKeySetManagerService(),
		mPm.mInjector);
		} catch (ReconcileFailure e) {
		@@ -2075,7 +2072,7 @@ final class InstallParams extends HandlerParams {
		throws PackageManagerException {
		final Message msg = mPm.mHandler.obtainMessage(INIT_COPY);
		final MultiPackageInstallParams params =
		new MultiPackageInstallParams(this, children);
		new MultiPackageInstallParams(this, children, mPm);
		params.setTraceMethod("installStageMultiPackage")
		.setTraceCookie(System.identityHashCode(params));
		msg.obj = params;
		@@ -2107,9 +2104,10 @@ final class InstallParams extends HandlerParams {
		private final List<InstallParams> mChildParams;
		private final Map<InstallArgs, Integer> mCurrentState;

		MultiPackageInstallParams(InstallParams parent, List<InstallParams> childParams)
		MultiPackageInstallParams(InstallParams parent, List<InstallParams> childParams,
		PackageManagerService pm)
		throws PackageManagerException {
		super(parent.getUser());
		super(parent.getUser(), pm);
		if (childParams.size() == 0) {
		throw new PackageManagerException("No child sessions found!");
		}
		@@ -2159,4 +2157,6 @@ final class InstallParams extends HandlerParams {
		installRequests);
		}
		}


		}

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

0 → 100644

+783 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+57 −2068

File changed.

Preview size limit exceeded, changes collapsed.