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

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

Merge "Do not fail early when one of the verification fails so that we don't... 

Merge "Do not fail early when one of the verification fails so that we don't delete the apk file while the other verification is still accessing it."
parents 98d19712 ff5dec99

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

+2 −4
Original line number Diff line number Diff line
@@ -14707,8 +14707,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        void handleVerificationFinished() {

            if (!mVerificationCompleted) {

                mVerificationCompleted = true;

                if (mIntegrityVerificationCompleted || mRet != INSTALL_SUCCEEDED) {

                    mIntegrityVerificationCompleted = true;

                if (mIntegrityVerificationCompleted) {

                    handleReturnCode();

                }

                // integrity verification still pending.
@@ -14718,8 +14717,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        void handleIntegrityVerificationFinished() {

            if (!mIntegrityVerificationCompleted) {

                mIntegrityVerificationCompleted = true;

                if (mVerificationCompleted || mRet != INSTALL_SUCCEEDED) {

                    mVerificationCompleted = true;

                if (mVerificationCompleted) {

                    handleReturnCode();

                }

                // verifier still pending