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

Commit 9b51b731 authored by JW Wang's avatar JW Wang
Browse files

Check the white list to decide whether to enable rollback (2/n) 

Bug: 144680850
Test: atest RollbackTest StagedRollbackTest
Change-Id: I4b6b42d6a0fce836d7ebaca8bcde8c837c086e9b
parent 70b60797

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+10 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.internal.util.DumpUtils; 
import com.android.internal.util.IndentingPrintWriter;

import com.android.server.LocalServices;

import com.android.server.PackageWatchdog;

import com.android.server.SystemConfig;

import com.android.server.Watchdog;

import com.android.server.pm.Installer;
@@ -1003,10 +1004,18 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
                installerPackageName) == PackageManager.PERMISSION_GRANTED;



        // For now only allow rollbacks for modules or for testing.

        return (isModule(packageName) && manageRollbacksGranted)

        return (isRollbackWhitelisted(packageName) && manageRollbacksGranted)

            || testManageRollbacksGranted;

    }



    /**

     * Returns true is this package is eligible for enabling rollback.

     */

    private boolean isRollbackWhitelisted(String packageName) {

        // TODO: Remove #isModule when the white list is ready.

        return SystemConfig.getInstance().getRollbackWhitelistedPackages().contains(packageName)

                || isModule(packageName);

    }

    /**

     * Returns true if the package name is the name of a module.

     */

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java

+24 −0
Original line number Diff line number Diff line
@@ -1098,4 +1098,28 @@ public class RollbackTest { 
            InstallUtils.dropShellPermissionIdentity();

        }

    }



    /**

     * Test we can't enable rollback for non-whitelisted app without

     * TEST_MANAGE_ROLLBACKS permission

     */

    @Test

    public void testNonRollbackWhitelistedApp() throws Exception {

        try {

            InstallUtils.adoptShellPermissionIdentity(

                    Manifest.permission.INSTALL_PACKAGES,

                    Manifest.permission.DELETE_PACKAGES,

                    Manifest.permission.MANAGE_ROLLBACKS);



            Uninstall.packages(TestApp.A);

            Install.single(TestApp.A1).commit();

            assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();



            Install.single(TestApp.A2).setEnableRollback().commit();

            Thread.sleep(TimeUnit.SECONDS.toMillis(2));

            assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();

        } finally {

            InstallUtils.dropShellPermissionIdentity();

        }

    }

}

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java

+32 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.cts.install.lib.TestApp; 
import com.android.cts.install.lib.Uninstall;

import com.android.cts.rollback.lib.Rollback;

import com.android.cts.rollback.lib.RollbackUtils;

import com.android.internal.R;



import libcore.io.IoUtils;
@@ -341,6 +342,37 @@ public class StagedRollbackTest { 
                        getNetworkStackPackageName())).isNull();

    }



    private static String getModuleMetadataPackageName() {

        return InstrumentationRegistry.getInstrumentation().getContext()

                .getResources().getString(R.string.config_defaultModuleMetadataProvider);

    }



    @Test

    public void testRollbackWhitelistedApp_Phase1() throws Exception {

        // Remove available rollbacks

        String pkgName = getModuleMetadataPackageName();

        RollbackUtils.getRollbackManager().expireRollbackForPackage(pkgName);

        assertThat(RollbackUtils.getAvailableRollback(pkgName)).isNull();



        // Overwrite existing permissions. We don't want TEST_MANAGE_ROLLBACKS which allows us

        // to enable rollback for any app

        InstallUtils.adoptShellPermissionIdentity(

                Manifest.permission.INSTALL_PACKAGES,

                Manifest.permission.MANAGE_ROLLBACKS);



        // Re-install a whitelisted app with rollbacks enabled

        String filePath = InstrumentationRegistry.getInstrumentation().getContext()

                .getPackageManager().getPackageInfo(pkgName, 0).applicationInfo.sourceDir;

        TestApp app = new TestApp("ModuleMetadata", pkgName, -1, false, new File(filePath));

        Install.single(app).setStaged().setEnableRollback()

                .addInstallFlags(PackageManager.INSTALL_REPLACE_EXISTING).commit();

    }



    @Test

    public void testRollbackWhitelistedApp_Phase2() throws Exception {

        assertThat(RollbackUtils.getAvailableRollback(getModuleMetadataPackageName())).isNotNull();

    }



    private static void runShellCommand(String cmd) {

        ParcelFileDescriptor pfd = InstrumentationRegistry.getInstrumentation().getUiAutomation()

                .executeShellCommand(cmd);

tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java

+10 −0
Original line number Diff line number Diff line
@@ -175,6 +175,16 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { 
        runPhase("testPreviouslyAbandonedRollbacks_Phase3");

    }



    /**

     * Tests we can enable rollback for a whitelisted app.

     */

    @Test

    public void testRollbackWhitelistedApp() throws Exception {

        runPhase("testRollbackWhitelistedApp_Phase1");

        getDevice().reboot();

        runPhase("testRollbackWhitelistedApp_Phase2");

    }



    private void crashProcess(String processName, int numberOfCrashes) throws Exception {

        String pid = "";

        String lastPid = "invalid";