Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Consistent result when signatures don't match." into lmp-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2014-12-09 17:10:10 +00:00
committed by Android (Google) Code Review
parent 9ba89ad8eb 10bef1d2f4
commit 2f4ced3009
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

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