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

Commit 92d75177 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only collect APK certificates for system apps after OTA"

parents b69dd01a 7cd62d05
Loading
Loading
Loading
Loading
+7 −6
Original line number Original line Diff line number Diff line
@@ -8866,15 +8866,16 @@ public class PackageManagerService extends IPackageManager.Stub
                    + " better than this " + pkg.getLongVersionCode());
                    + " better than this " + pkg.getLongVersionCode());
        }
        }
        // Verify certificates against what was last scanned. If there was an upgrade or this is an
        // Verify certificates against what was last scanned. If there was an upgrade and this is an
        // updated priv app, we will force re-collecting certificate.
        // app in a system partition, or if this is an updated priv app, we will force re-collecting
        final boolean forceCollect = mIsUpgrade ||
        // certificate.
                PackageManagerServiceUtils.isApkVerificationForced(disabledPkgSetting);
        final boolean forceCollect = (mIsUpgrade && scanSystemPartition)
                || PackageManagerServiceUtils.isApkVerificationForced(disabledPkgSetting);
        // Full APK verification can be skipped during certificate collection, only if the file is
        // 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
        // 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.
        // cases, only data in Signing Block is verified instead of the whole file.
        final boolean skipVerify = ((parseFlags & PackageParser.PARSE_IS_SYSTEM_DIR) != 0) ||
        final boolean skipVerify = scanSystemPartition
                (forceCollect && canSkipFullPackageVerification(pkg));
                || (forceCollect && canSkipFullPackageVerification(pkg));
        collectCertificatesLI(pkgSetting, pkg, forceCollect, skipVerify);
        collectCertificatesLI(pkgSetting, pkg, forceCollect, skipVerify);
        // Reset profile if the application version is changed
        // Reset profile if the application version is changed