Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ca0ea6b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am b97633c1: am 5d662a82: am 2f4ced30: Merge "Consistent result when... 

am b97633c1: am 5d662a82: am 2f4ced30: Merge "Consistent result when signatures don\'t match." into lmp-mr1-dev

* commit 'b97633c1':
  Consistent result when signatures don't match.
parents 0360f2a1 b97633c1

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

+2 −2
Original line number Diff line number Diff line
@@ -10201,13 +10201,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;