summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-06-18 19:50:37 (GMT)
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-06-18 19:50:37 (GMT)
commit098e0a644046b33ae9b649f20f3c23dd9108e57d (patch)
treebdc867eda68277890dfebad88c9db3827c0452f7
parentafc931f3ccde3374055f161cf206e9d70e90dd38 (diff)
parentcd86ddeca54b03c414b44331a498edcd136fa6bb (diff)
downloadframeworks_base-098e0a644046b33ae9b649f20f3c23dd9108e57d.zip
frameworks_base-098e0a644046b33ae9b649f20f3c23dd9108e57d.tar.gz
frameworks_base-098e0a644046b33ae9b649f20f3c23dd9108e57d.tar.bz2
Merge cherrypicks of [8048558] into pi-qpr3-release
Change-Id: Idafdd7576b5a05a593a34a5cd848c8260cf88c04
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java8
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 3cde709b..c414aba 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.