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

Commit 37d37be8 authored by JW Wang's avatar JW Wang
Browse files

Use shell command to uninstall network stack package (2/n) 

Since install is done by shell command, uninstall must also use shell
command to succeed.

Bug: 143211397
Test: atest StagedRollbackTest
Change-Id: Ie81d793212b2b3dc00ff84037e6be8782695c499
parent 9ba5f6b8

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

+8 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ public class StagedRollbackTest { 
        String networkStack = getNetworkStackPackageName();



        rm.expireRollbackForPackage(networkStack);

        Uninstall.packages(networkStack);

        uninstallNetworkStackPackage();



        assertThat(getUniqueRollbackInfoForPackage(rm.getAvailableRollbacks(),

                        networkStack)).isNull();
@@ -252,6 +252,12 @@ public class StagedRollbackTest { 
        return comp.getPackageName();

    }



    private void uninstallNetworkStackPackage() {

        // Since the host side use shell command to install the network stack package, uninstall

        // must be done by shell command as well. Otherwise uninstall by a different user will fail.

        runShellCommand("pm uninstall " + getNetworkStackPackageName());

    }



    @Test

    public void testPreviouslyAbandonedRollbacks_Phase1() throws Exception {

        Uninstall.packages(TestApp.A);
@@ -294,7 +300,7 @@ public class StagedRollbackTest { 
        String networkStack = getNetworkStackPackageName();



        rm.expireRollbackForPackage(networkStack);

        Uninstall.packages(networkStack);

        uninstallNetworkStackPackage();



        assertThat(getUniqueRollbackInfoForPackage(rm.getAvailableRollbacks(),

                        networkStack)).isNull();