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

Commit 94ff92ef authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Prevent committing session while in progress"" into tm-qpr-dev am: aac6f0ff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20500128



Change-Id: I2e5eaf8a662f48c7a4195646bd2b3dd68faabde5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 807a2d90 aac6f0ff

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

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

    private boolean mStageDirInUse = false;



    /**

     * True if the installation is already in progress. This is used to prevent the caller

     * from {@link #commit(IntentSender, boolean) committing} the session again while the

     * installation is still in progress.

     */

    @GuardedBy("mLock")

    private boolean mInstallationInProgress = false;



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

    @GuardedBy("mLock")

    private boolean mPermissionsManuallyAccepted = false;
@@ -1669,14 +1661,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            }

        }



        synchronized (mLock) {

            if (mInstallationInProgress) {

                throw new IllegalStateException("Installation is already in progress. Don't "

                        + "commit session=" + sessionId + " again.");

            }

            mInstallationInProgress = true;

        }



        dispatchSessionSealed();

    }