Merge changes from topic "fail-validation-q" into qt-qpr1-dev am: b467f2237e am: 0c2d876d69

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

Change-Id: I6bd518dfcc82dffde8846a3e076df5e76b5317ff
This commit is contained in:
TreeHugger Robot
2020-12-07 18:13:13 +00:00
committed by Automerger Merge Worker

View File

@@ -299,6 +299,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
final ArraySet<File> unclaimedStages = newArraySet(
stagingDir.listFiles(sStageFilter));
// We also need to clean up orphaned staging directory for staged sessions
final File stagedSessionStagingDir = Environment.getDataStagingDirectory(volumeUuid);
unclaimedStages.addAll(newArraySet(stagedSessionStagingDir.listFiles()));
// Ignore stages claimed by active sessions
for (int i = 0; i < mSessions.size(); i++) {
final PackageInstallerSession session = mSessions.valueAt(i);