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

Merge "Ensure system behaves properly when app-staging dir is deleted"

Browse Source
This commit is contained in:
Mohammad Samiul Islam
2021-01-18 16:08:56 +00:00
committed by Android (Google) Code Review
parent 9713e3e4a9 37c5622067
commit c8ddbaabeb
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java
View File

@@ -140,6 +140,21 @@ public class StagedInstallInternalTest {
Install.multi(TestApp.AIncompleteSplit, TestApp.B1, TestApp.Apex1).setStaged());
}
@Test
public void testFailStagedSessionIfStagingDirectoryDeleted_Commit() throws Exception {
int sessionId = Install.multi(TestApp.A1, TestApp.Apex1).setStaged().commit();
assertSessionReady(sessionId);
storeSessionId(sessionId);
}
@Test
public void testFailStagedSessionIfStagingDirectoryDeleted_Verify() throws Exception {
int sessionId = retrieveLastSessionId();
PackageInstaller.SessionInfo info =
InstallUtils.getPackageInstaller().getSessionInfo(sessionId);
assertThat(info.isStagedSessionFailed()).isTrue();
}
private static void assertSessionReady(int sessionId) {
assertSessionState(sessionId,
(session) -> assertThat(session.isStagedSessionReady()).isTrue());

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

@@ -279,6 +279,21 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
assertThat(getStagingDirectories()).isEmpty();
}
@Test
public void testFailStagedSessionIfStagingDirectoryDeleted() throws Exception {
// Create a staged session
runPhase("testFailStagedSessionIfStagingDirectoryDeleted_Commit");
// Delete the staging directory
getDevice().enableAdbRoot();
getDevice().executeShellCommand("rm -r /data/app-staging");
getDevice().disableAdbRoot();
getDevice().reboot();
runPhase("testFailStagedSessionIfStagingDirectoryDeleted_Verify");
}
private List<String> getStagingDirectories() throws DeviceNotAvailableException {
String baseDir = "/data/app-staging";
try {