Merge "Consistent result when signatures don't match." into lmp-mr1-dev (2f4ced30) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -10199,13 +10199,13 @@ public class PackageManagerService extends IPackageManager.Stub {
		// default to original signature matching
		if (compareSignatures(oldPackage.mSignatures, pkg.mSignatures)
		!= PackageManager.SIGNATURE_MATCH) {
		res.setError(INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES,
		res.setError(INSTALL_FAILED_UPDATE_INCOMPATIBLE,
		"New package has a different signature: " + pkgName);
		return;
		}
		} else {
		if(!checkUpgradeKeySetLP(ps, pkg)) {
		res.setError(INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES,
		res.setError(INSTALL_FAILED_UPDATE_INCOMPATIBLE,
		"New package not signed by keys specified by upgrade-keysets: "
		+ pkgName);
		return;