Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't abandon child sessions (1/n)" into qt-dev

Browse Source
This commit is contained in:
Songchun Fan
2022-01-11 23:31:01 +00:00
committed by Android (Google) Code Review
parent 331b617949 a4ef9e0e00
commit 5bf4a3f29e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -330,7 +330,13 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
if (age >= MAX_SESSION_AGE_ON_LOW_STORAGE_MILLIS) { if (age >= MAX_SESSION_AGE_ON_LOW_STORAGE_MILLIS) {
// Aggressively close old sessions because we are running low on storage // Aggressively close old sessions because we are running low on storage
// Their staging dirs will be removed too // Their staging dirs will be removed too
session.abandon(); PackageInstallerSession root = !session.hasParentSessionId()
? session : mSessions.get(session.getParentSessionId());
if (!root.isDestroyed() &&
(!root.isStaged() || (root.isStaged() && root.isStagedSessionReady())))
{
root.abandon();
}
} else { } else {
// Session is new enough, so it deserves to be kept even on low storage // Session is new enough, so it deserves to be kept even on low storage
unclaimedStagingDirsOnVolume.remove(session.stageDir); unclaimedStagingDirsOnVolume.remove(session.stageDir);