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

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

Browse Source 
* commit '5d662a828935399e11723d0a5e7ff31c433e8b39':
  Consistent result when signatures don't match.
This commit is contained in:
Jeff Sharkey
2014-12-09 17:22:12 +00:00
committed by Android Git Automerger
parent 40c5c0ef16 5d662a8289
commit b97633c14d
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

@@ -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;