Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa7d6d0e authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fail-validation-rvc-plus-aosp" into rvc-qpr-dev-plus-aosp 

* changes:
  Delete orphaned staging directories for staged session on reboot
  Clean up staged session data on validation failure
parents 7fab6a48 84766954

services/core/java/com/android/server/pm/PackageInstallerService.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/pm/PackageInstallerSession.java

+4 −0
Original line number Diff line number Diff line
@@ -1597,6 +1597,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        destroyInternal();

        // Dispatch message to remove session from PackageInstallerService.

        dispatchSessionFinished(error, detailMessage, null);

        // TODO(b/173194203): clean up staged session in destroyInternal() call instead

        if (isStaged() && stageDir != null) {

            cleanStageDir();

        }

    }



    private void onStorageUnhealthy() {

tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java

+13 −0
Original line number Diff line number Diff line
@@ -96,6 +96,19 @@ public class StagedInstallInternalTest { 
        assertSessionReady(sessionId);

    }



    @Test

    public void testStagedInstallationShouldCleanUpOnValidationFailure() throws Exception {

        InstallUtils.commitExpectingFailure(AssertionError.class, "INSTALL_FAILED_INVALID_APK",

                Install.single(TestApp.AIncompleteSplit).setStaged());

    }



    @Test

    public void testStagedInstallationShouldCleanUpOnValidationFailureMultiPackage()

            throws Exception {

        InstallUtils.commitExpectingFailure(AssertionError.class, "INSTALL_FAILED_INVALID_APK",

                Install.multi(TestApp.AIncompleteSplit, TestApp.B1, TestApp.Apex1).setStaged());

    }



    private static void assertSessionReady(int sessionId) {

        assertSessionState(sessionId,

                (session) -> assertThat(session.isStagedSessionReady()).isTrue());

tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java

+50 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.cts.install.lib.host.InstallUtilsHost; 
import com.android.ddmlib.Log;

import com.android.tests.rollback.host.AbandonSessionsRule;

import com.android.tests.util.ModuleTestUtils;

import com.android.tradefed.device.DeviceNotAvailableException;

import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;

import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;

import com.android.tradefed.util.ProcessInfo;
@@ -39,6 +40,9 @@ import org.junit.Test; 
import org.junit.runner.RunWith;



import java.io.File;

import java.util.Collections;

import java.util.List;

import java.util.stream.Collectors;



@RunWith(DeviceJUnit4ClassRunner.class)

public class StagedInstallInternalTest extends BaseHostJUnit4Test {
@@ -182,6 +186,52 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 
        assertThat(sessionIds.length).isEqualTo(3);

    }



    @Test

    public void testStagedInstallationShouldCleanUpOnValidationFailure() throws Exception {

        List<String> before = getStagingDirectories();

        runPhase("testStagedInstallationShouldCleanUpOnValidationFailure");

        List<String> after = getStagingDirectories();

        assertThat(after).isEqualTo(before);

    }



    @Test

    public void testStagedInstallationShouldCleanUpOnValidationFailureMultiPackage()

            throws Exception {

        List<String> before = getStagingDirectories();

        runPhase("testStagedInstallationShouldCleanUpOnValidationFailureMultiPackage");

        List<String> after = getStagingDirectories();

        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 {

        String baseDir = "/data/app-staging";

        try {

            getDevice().enableAdbRoot();

            return getDevice().getFileEntry(baseDir).getChildren(false)

                    .stream().filter(entry -> entry.getName().matches("session_\\d+"))

                    .map(entry -> entry.getName())

                    .collect(Collectors.toList());

        } catch (Exception e) {

            // Return an empty list if any error

            return Collections.EMPTY_LIST;

        } finally {

            getDevice().disableAdbRoot();

        }

    }



    private void restartSystemServer() throws Exception {

        // Restart the system server

        long oldStartTime = getDevice().getProcessByName("system_server").getStartTime();