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

Delete orphaned staging directories for staged session on reboot

Browse Source 
Bug: 173132101
Test: StagedInstallInternalTest#testOrphanedStagingDirectoryGetsCleanedUpOnReboot
Change-Id: If840f35245c2d049401d0d2f6539fe8c4625151e
Merged-In: If840f35245c2d049401d0d2f6539fe8c4625151e
(cherry picked from commit bfbf960801)
This commit is contained in:
Mohammad Samiul Islam
2020-11-13 19:08:31 +00:00
parent 94543591b0
commit 8476695451
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,6 +299,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
final ArraySet<File> unclaimedStages = newArraySet( final ArraySet<File> unclaimedStages = newArraySet(
stagingDir.listFiles(sStageFilter)); 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 // Ignore stages claimed by active sessions
for (int i = 0; i < mSessions.size(); i++) { for (int i = 0; i < mSessions.size(); i++) {
final PackageInstallerSession session = mSessions.valueAt(i); final PackageInstallerSession session = mSessions.valueAt(i);

13
tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java
View File

@@ -203,6 +203,19 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
assertThat(after).isEqualTo(before); assertThat(after).isEqualTo(before);
} }
@Test
public void testOrphanedStagingDirectoryGetsCleanedUpOnReboot() throws Exception {
//create random directories in /data/app-staging folder
getDevice().enableAdbRoot();
getDevice().executeShellCommand("mkdir /data/app-staging/session_123");
getDevice().executeShellCommand("mkdir /data/app-staging/random_name");
getDevice().disableAdbRoot();
assertThat(getStagingDirectories()).isNotEmpty();
getDevice().reboot();
assertThat(getStagingDirectories()).isEmpty();
}
private List<String> getStagingDirectories() throws DeviceNotAvailableException { private List<String> getStagingDirectories() throws DeviceNotAvailableException {
String baseDir = "/data/app-staging"; String baseDir = "/data/app-staging";
try { try {