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

Commit e16da5a4 authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Prevent interleaved verification" into tm-qpr-dev

parents 43f386b3 2e968c80

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

+14 −0
Original line number Diff line number Diff line
@@ -366,6 +366,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    @GuardedBy("mLock")

    private boolean mStageDirInUse = false;



    /**

     * True if the verification is already in progress. This is used to prevent running

     * verification again while one is already in progress which will break internal states.

     *

     * Worker thread only.

     */

    private boolean mVerificationInProgress = false;



    /** Permissions have been accepted by the user (see {@link #setPermissionsResult}) */

    @GuardedBy("mLock")

    private boolean mPermissionsManuallyAccepted = false;
@@ -2136,6 +2144,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            return;

        }



        if (mVerificationInProgress) {

            Slog.w(TAG, "Verification is already in progress for session " + sessionId);

            return;

        }

        mVerificationInProgress = true;



        if (params.isStaged) {

            mStagedSession.verifySession();

        } else {