diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-20 01:34:53 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-20 01:34:53 +0000 |
| commit | ae0c2eeba3f60c62f63ec83b63d9c0593a0430fe (patch) | |
| tree | 1bdde61fa96faf466e40f78c3d6580c8f54c6dd9 | |
| parent | d29c48e3c3165bd7ee50109a7ed633290caf429a (diff) | |
| parent | fa00d60b1239b7f7830b2b818ef15993e4ebc217 (diff) | |
| download | base-pie-qpr3-b-release.tar.gz | |
Merge cherrypicks of [8066319] into pi-qpr3-b-releaseandroid-9.0.0_r47pie-qpr3-b-release
Change-Id: I86ec97700963540f7ce9686e7ac0151812e58a8b
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 3cde709bfeb2..c414abac12a7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -8821,10 +8821,10 @@ public class PackageManagerService extends IPackageManager.Stub + " better than this " + pkg.getLongVersionCode()); } - // Verify certificates against what was last scanned. If it is an updated priv app, we will - // force re-collecting certificate. - final boolean forceCollect = PackageManagerServiceUtils.isApkVerificationForced( - disabledPkgSetting); + // Verify certificates against what was last scanned. If there was an upgrade or this is an + // updated priv app, we will force re-collecting certificate. + final boolean forceCollect = mIsUpgrade || + PackageManagerServiceUtils.isApkVerificationForced(disabledPkgSetting); // Full APK verification can be skipped during certificate collection, only if the file is // in verified partition, or can be verified on access (when apk verity is enabled). In both // cases, only data in Signing Block is verified instead of the whole file. |