Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc2f337c authored by Bryan Henry's avatar Bryan Henry Committed by Android (Google) Code Review
Browse files

Merge "Collect APK certificates after an OTA, rather than relying on timestamps"

parents dc8b4ebe 770f3579

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -8912,10 +8912,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.