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

Commit 60ba6b80 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Always send verification request to sufficient verifiers" into rvc-dev am: 57dac25b 

Change-Id: I84fbef58a523b554d261cc209e0089760a2fef61
parents 59f5b502 57dac25b

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

+4 −5
Original line number Diff line number Diff line
@@ -14741,9 +14741,8 @@ public class PackageManagerService extends IPackageManager.Stub 
            verificationState.setRequiredVerifierUid(requiredUid);

            final int installerUid =

                    verificationInfo == null ? -1 : verificationInfo.installerUid;

            if (!origin.existing && requiredUid != -1

                    && isVerificationEnabled(

                            pkgLite, verifierUser.getIdentifier(), installFlags, installerUid)) {

            if (!origin.existing && isVerificationEnabled(pkgLite, verifierUser.getIdentifier(),

                      installFlags, installerUid)) {

                final Intent verification = new Intent(

                        Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);

                verification.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
@@ -14809,9 +14808,9 @@ public class PackageManagerService extends IPackageManager.Stub 
                    }

                }













                if (mRequiredVerifierPackage != null) {















                    final ComponentName requiredVerifierComponent = matchComponentForVerifier(















                            mRequiredVerifierPackage, receivers);













                if (mRequiredVerifierPackage != null) {















                    /*















                     * Send the intent to the required verification agent,















                     * but only start the verification timeout after the