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

Commit 1a96eb6d authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam
Browse files

Replace abortActiveSession in StagingManager with revertActiveSessions 

Bug: 141843321
Test: atest StagedInstallTest
Change-Id: I7fc5397f86f843cfb956364775af6fa5369037ba
parent f80a7518

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

+4 −4
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ abstract class ApexManager { 
     *

     * @return {@code true} upon success, {@code false} if any remote exception occurs

     */

    abstract boolean abortActiveSession();

    abstract boolean revertActiveSessions();



    /**

     * Abandons the staged session with the given sessionId.
@@ -492,9 +492,9 @@ abstract class ApexManager { 
        }



        @Override

        boolean abortActiveSession() {

        boolean revertActiveSessions() {

            try {

                mApexService.abortActiveSession();

                mApexService.revertActiveSessions();

                return true;

            } catch (RemoteException re) {

                Slog.e(TAG, "Unable to contact apexservice", re);
@@ -700,7 +700,7 @@ abstract class ApexManager { 
        }



        @Override

        boolean abortActiveSession() {

        boolean revertActiveSessions() {

            throw new UnsupportedOperationException();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ public class StagingManager { 
                return;

            }



            if (!mApexManager.abortActiveSession()) {

            if (!mApexManager.revertActiveSessions()) {

                Slog.e(TAG, "Failed to abort APEXd session");

            } else {

                Slog.e(TAG,

services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -217,11 +217,11 @@ public class ApexManagerTest { 
    }



    @Test

    public void testAbortActiveSession_remoteException() throws RemoteException {

        doThrow(RemoteException.class).when(mApexService).abortActiveSession();

    public void testRevertActiveSessions_remoteException() throws RemoteException {

        doThrow(RemoteException.class).when(mApexService).revertActiveSessions();



        try {

            assertThat(mApexManager.abortActiveSession()).isFalse();

            assertThat(mApexManager.revertActiveSessions()).isFalse();

        } catch (Exception e) {

            throw new AssertionError("ApexManager should not raise Exception");

        }