Merge cherrypicks of [8066319] into pi-qpr3-b-release

Change-Id: I86ec97700963540f7ce9686e7ac0151812e58a8b
This commit is contained in:
android-build-team Robot
2019-06-20 01:34:53 +00:00

View File

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