summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chun-Wei Wang <wangchun@google.com> 2022-11-17 02:35:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-17 02:35:27 +0000
commit94ff92ef5b42d435a3f41078a5fa9871cfd54bcd (patch)
treeda3c6e94868525b5dd3c8b157644b2593b658626
parent807a2d906adbe80fff55f5a933d786fbe5c733b3 (diff)
parentaac6f0ff364f04e96c6f1da0df719c7266d53a98 (diff)
Merge "Revert "Prevent committing session while in progress"" into tm-qpr-dev am: aac6f0ff36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20500128 Change-Id: I2e5eaf8a662f48c7a4195646bd2b3dd68faabde5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/pm/PackageInstallerSession.java16
1 files changed, 0 insertions, 16 deletions
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 06458d1bf50c..37bfbb11948a 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -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();
}