From 6b86ed849780dedd0f9319833e53bb194d74fefa Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Tue, 28 Jun 2022 01:08:02 +0000 Subject: [PATCH] [RESTRICT AUTOMERGE] Revert "Don't abandon child sessions (1/n)" Revert submission 16575908-dont_abandon_child_qt_dev Reason for revert: Reverting CVE-2021-39624 on qt-dev Reverted Changes: I4ede6b7a4:Persist destroyed staged sessions until they are c... Ib0ba9f378:Don't abandon child sessions (1/n) Change-Id: I7915e3f0ba6dd8430a9b938a518aeeeb4d6b1805 --- .../com/android/server/pm/PackageInstallerService.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 7c1ac2737469a..ac56020f95a14 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -330,13 +330,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements if (age >= MAX_SESSION_AGE_ON_LOW_STORAGE_MILLIS) { // Aggressively close old sessions because we are running low on storage // Their staging dirs will be removed too - PackageInstallerSession root = !session.hasParentSessionId() - ? session : mSessions.get(session.getParentSessionId()); - if (!root.isDestroyed() && - (!root.isStaged() || (root.isStaged() && root.isStagedSessionReady()))) - { - root.abandon(); - } + session.abandon(); } else { // Session is new enough, so it deserves to be kept even on low storage unclaimedStagingDirsOnVolume.remove(session.stageDir);