summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2014-12-08 16:41:04 -0800
committer Jeff Sharkey <jsharkey@android.com> 2014-12-08 16:41:04 -0800
commit10bef1d2f444b8ca23ee317d3bcfb586860af18b (patch)
tree1cd022de983544277827057791d742b9c4dcca61
parent6973634ce61ab7d4c1d51c70be6d51725b89e7b9 (diff)
Consistent result when signatures don't match.
INSTALL_FAILED_UPDATE_INCOMPATIBLE is a better description of the real underlying cause when signatures don't match. Bug: 18413784 Change-Id: Ib81591df7d0d79f6725a4fa7300ae4e20958f004
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 6f1e8510fc37..91637e32ef10 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -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;