Merge "Remove an unused parameter from InstallArgs.doRename" (fb4d62b6) · Commits · e / os / android_frameworks_base

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

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -15834,7 +15834,7 @@ public class PackageManagerService extends IPackageManager.Stub
	* Rename package into final resting place. All paths on the given		* Rename package into final resting place. All paths on the given
	* scanned package should be updated to reflect the rename.		* scanned package should be updated to reflect the rename.
	*/		*/
	abstract boolean doRename(int status, PackageParser.Package pkg, String oldCodePath);		abstract boolean doRename(int status, PackageParser.Package pkg);
	abstract int doPostInstall(int status, int uid);		abstract int doPostInstall(int status, int uid);

	/** @see PackageSettingBase#codePathString */		/** @see PackageSettingBase#codePathString */
	@@ -16010,7 +16010,7 @@ public class PackageManagerService extends IPackageManager.Stub
	return status;		return status;
	}		}

	boolean doRename(int status, PackageParser.Package pkg, String oldCodePath) {		boolean doRename(int status, PackageParser.Package pkg) {
	if (status != PackageManager.INSTALL_SUCCEEDED) {		if (status != PackageManager.INSTALL_SUCCEEDED) {
	cleanUp();		cleanUp();
	return false;		return false;
	@@ -16169,7 +16169,7 @@ public class PackageManagerService extends IPackageManager.Stub
	return status;		return status;
	}		}

	boolean doRename(int status, PackageParser.Package pkg, String oldCodePath) {		boolean doRename(int status, PackageParser.Package pkg) {
	if (status != PackageManager.INSTALL_SUCCEEDED) {		if (status != PackageManager.INSTALL_SUCCEEDED) {
	cleanUp(move.toUuid);		cleanUp(move.toUuid);
	return false;		return false;
	@@ -17232,7 +17232,6 @@ public class PackageManagerService extends IPackageManager.Stub

	// Get rid of all references to package scan path via parser.		// Get rid of all references to package scan path via parser.
	pp = null;		pp = null;
	String oldCodePath = null;
	boolean systemApp = false;		boolean systemApp = false;
	synchronized (mPackages) {		synchronized (mPackages) {
	// Check if installing already existing package		// Check if installing already existing package
	@@ -17344,7 +17343,6 @@ public class PackageManagerService extends IPackageManager.Stub
	}		}
	}		}

	oldCodePath = mSettings.mPackages.get(pkgName).codePathString;
	if (ps.pkg != null && ps.pkg.applicationInfo != null) {		if (ps.pkg != null && ps.pkg.applicationInfo != null) {
	systemApp = (ps.pkg.applicationInfo.flags &		systemApp = (ps.pkg.applicationInfo.flags &
	ApplicationInfo.FLAG_SYSTEM) != 0;		ApplicationInfo.FLAG_SYSTEM) != 0;
	@@ -17494,7 +17492,7 @@ public class PackageManagerService extends IPackageManager.Stub
	}		}
	}		}

	if (!args.doRename(res.returnCode, pkg, oldCodePath)) {		if (!args.doRename(res.returnCode, pkg)) {
	res.setError(INSTALL_FAILED_INSUFFICIENT_STORAGE, "Failed rename");		res.setError(INSTALL_FAILED_INSUFFICIENT_STORAGE, "Failed rename");
	return;		return;
	}		}