am 8cb52c8a: am bc50bdca: am e259bc77: Fix issue #2558391: Package manager... (7878238e) · Commits · e / os / android_frameworks_base

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

+12 −1

Original line number	Diff line number	Diff line
		@@ -5488,6 +5488,17 @@ class PackageManagerService extends IPackageManager.Stub {
		boolean dataDirExists = getDataPathForPackage(pkg).exists();
		res.name = pkgName;
		synchronized(mPackages) {
		if (mSettings.mRenamedPackages.containsKey(pkgName)) {
		// A package with the same name is already installed, though
		// it has been renamed to an older name. The package we
		// are trying to install should be installed as an update to
		// the existing one, but that has not been requested, so bail.
		Slog.w(TAG, "Attempt to re-install " + pkgName
		+ " without first uninstalling package running as "
		+ mSettings.mRenamedPackages.get(pkgName));
		res.returnCode = PackageManager.INSTALL_FAILED_ALREADY_EXISTS;
		return;
		}
		if (mPackages.containsKey(pkgName) \|\| mAppDirs.containsKey(pkg.mPath)) {
		// Don't allow installation over an existing package with the same name.
		Slog.w(TAG, "Attempt to re-install " + pkgName
		@@ -5619,7 +5630,7 @@ class PackageManagerService extends IPackageManager.Stub {
		PackageInstalledInfo restoreRes = new PackageInstalledInfo();
		restoreRes.removedInfo = new PackageRemovedInfo();
		// Parse old package
		parseFlags \|= ~PackageManager.INSTALL_REPLACE_EXISTING;
		parseFlags &= ~PackageManager.INSTALL_REPLACE_EXISTING;
		scanPackageLI(restoreFile, parseFlags, scanMode);
		synchronized (mPackages) {
		updatePermissionsLP(deletedPackage.packageName, deletedPackage,