Merge changes Ie479be5b,I299245fc (be924974) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -571,7 +571,7 @@ public class PackageManagerServiceUtils {
		if (!match) {
		throw new PackageManagerException(INSTALL_FAILED_UPDATE_INCOMPATIBLE,
		"Package " + packageName +
		" signatures don't match previously installed version; ignoring!");
		" signatures do not match previously installed version; ignoring!");
		}
		}
		// Check for shared user signatures
		@@ -579,16 +579,16 @@ public class PackageManagerServiceUtils {
		// Already existing package. Make sure signatures match
		boolean match = compareSignatures(pkgSetting.sharedUser.signatures.mSignatures,
		parsedSignatures) == PackageManager.SIGNATURE_MATCH;
		if (!match) {
		if (!match && compareCompat) {
		match = matchSignaturesCompat(
		packageName, pkgSetting.sharedUser.signatures, parsedSignatures);
		}
		if (!match && compareCompat) {
		if (!match && compareRecover) {
		match = matchSignaturesRecover(
		packageName, pkgSetting.sharedUser.signatures.mSignatures, parsedSignatures);
		compatMatch \|= match;
		}
		if (!match && compareRecover) {
		if (!match) {
		throw new PackageManagerException(INSTALL_FAILED_SHARED_USER_INCOMPATIBLE,
		"Package " + packageName
		+ " has no signatures that match those in shared user "