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

Commit dd1fbf2b authored by Bernardo Rufino's avatar Bernardo Rufino
Browse files

Move some transport operations to Trampoline 

From BMS. Namely:
* initializeTransports()
* clearBackupData()
* getCurrentTransport()
* getCurrentTransportComponent()
* listAllTransports()
* listAllTransportComponents()

Test: atest BackupManagerServiceTest TrampolineRoboTest TrampolineTest
Bug: 135661048
Change-Id: Ib81550b4da7615f3713c340beccd3f85eb08ca7f
parent ae1b0d88

services/backup/java/com/android/server/backup/BackupManagerService.java

+0 −71
Original line number Diff line number Diff line
@@ -107,77 +107,6 @@ public class BackupManagerService { 
    // TRANSPORT OPERATIONS

    // ---------------------------------------------



    /** Run an initialize operation for the given transports {@code transportNames}. */

    public void initializeTransports(

            @UserIdInt int userId, String[] transportNames, IBackupObserver observer) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "initializeTransports()");



        if (userBackupManagerService != null) {

            userBackupManagerService.initializeTransports(transportNames, observer);

        }

    }



    /**

     * Clear the given package {@code packageName}'s backup data from the transport {@code

     * transportName}.

     */

    public void clearBackupData(@UserIdInt int userId, String transportName, String packageName) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "clearBackupData()");



        if (userBackupManagerService != null) {

            userBackupManagerService.clearBackupData(transportName, packageName);

        }

    }



    /** Return the name of the currently active transport. */

    @Nullable

    public String getCurrentTransport(@UserIdInt int userId) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "getCurrentTransport()");



        return userBackupManagerService == null

                ? null

                : userBackupManagerService.getCurrentTransport();

    }



    /**

     * Returns the {@link ComponentName} of the host service of the selected transport or {@code

     * null} if no transport selected or if the transport selected is not registered.

     */

    @Nullable

    public ComponentName getCurrentTransportComponent(@UserIdInt int userId) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "getCurrentTransportComponent()");



        return userBackupManagerService == null

                ? null

                : userBackupManagerService.getCurrentTransportComponent();

    }



    /** Report all known, available backup transports by name. */

    @Nullable

    public String[] listAllTransports(@UserIdInt int userId) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "listAllTransports()");



        return userBackupManagerService == null

                ? null

                : userBackupManagerService.listAllTransports();

    }



    /** Report all known, available backup transports by {@link ComponentName}. */

    @Nullable

    public ComponentName[] listAllTransportComponents(@UserIdInt int userId) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "listAllTransportComponents()");



        return userBackupManagerService == null

                ? null

                : userBackupManagerService.listAllTransportComponents();

    }



    /**

     * Update the attributes of the transport identified by {@code transportComponent}. If the

     * specified transport has not been bound at least once (for registration), this call will be

services/backup/java/com/android/server/backup/Trampoline.java

+81 −7
Original line number Diff line number Diff line
@@ -526,11 +526,26 @@ public class Trampoline extends IBackupManager.Stub { 
        }

    }



    // ---------------------------------------------

    // TRANSPORT OPERATIONS

    // ---------------------------------------------



    @Override

    public void initializeTransportsForUser(

            int userId, String[] transportNames, IBackupObserver observer) throws RemoteException {

        if (isUserReadyForBackup(userId)) {

            mService.initializeTransports(userId, transportNames, observer);

            initializeTransports(userId, transportNames, observer);

        }

    }



    /** Run an initialize operation for the given transports {@code transportNames}. */

    public void initializeTransports(

            @UserIdInt int userId, String[] transportNames, IBackupObserver observer) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "initializeTransports()");



        if (userBackupManagerService != null) {

            userBackupManagerService.initializeTransports(transportNames, observer);

        }

    }
@@ -538,7 +553,20 @@ public class Trampoline extends IBackupManager.Stub { 
    public void clearBackupDataForUser(int userId, String transportName, String packageName)

            throws RemoteException {

        if (isUserReadyForBackup(userId)) {

            mService.clearBackupData(userId, transportName, packageName);

            clearBackupData(userId, transportName, packageName);

        }

    }



    /**

     * Clear the given package {@code packageName}'s backup data from the transport {@code

     * transportName}.

     */

    public void clearBackupData(@UserIdInt int userId, String transportName, String packageName) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "clearBackupData()");



        if (userBackupManagerService != null) {

            userBackupManagerService.clearBackupData(transportName, packageName);

        }

    }
@@ -722,7 +750,7 @@ public class Trampoline extends IBackupManager.Stub { 


    @Override

    public String getCurrentTransportForUser(int userId) throws RemoteException {

        return (isUserReadyForBackup(userId)) ? mService.getCurrentTransport(userId) : null;

        return (isUserReadyForBackup(userId)) ? getCurrentTransport(userId) : null;

    }



    @Override
@@ -730,6 +758,17 @@ public class Trampoline extends IBackupManager.Stub { 
        return getCurrentTransportForUser(binderGetCallingUserId());

    }



    /** Return the name of the currently active transport. */

    @Nullable

    public String getCurrentTransport(@UserIdInt int userId) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "getCurrentTransport()");



        return userBackupManagerService == null

                ? null

                : userBackupManagerService.getCurrentTransport();

    }



    /**

     * Returns the {@link ComponentName} of the host service of the selected transport or

     * {@code null} if no transport selected or if the transport selected is not registered.
@@ -737,13 +776,37 @@ public class Trampoline extends IBackupManager.Stub { 
    @Override

    @Nullable

    public ComponentName getCurrentTransportComponentForUser(int userId) {

        return (isUserReadyForBackup(userId))

                ? mService.getCurrentTransportComponent(userId) : null;

        return (isUserReadyForBackup(userId)) ? getCurrentTransportComponent(userId) : null;

    }



    /**

     * Returns the {@link ComponentName} of the host service of the selected transport or {@code

     * null} if no transport selected or if the transport selected is not registered.

     */

    @Nullable

    public ComponentName getCurrentTransportComponent(@UserIdInt int userId) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "getCurrentTransportComponent()");



        return userBackupManagerService == null

                ? null

                : userBackupManagerService.getCurrentTransportComponent();

    }



    @Override

    public String[] listAllTransportsForUser(int userId) throws RemoteException {

        return (isUserReadyForBackup(userId)) ? mService.listAllTransports(userId) : null;

        return (isUserReadyForBackup(userId)) ? listAllTransports(userId) : null;

    }



    /** Report all known, available backup transports by name. */

    @Nullable

    public String[] listAllTransports(@UserIdInt int userId) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "listAllTransports()");



        return userBackupManagerService == null

                ? null

                : userBackupManagerService.listAllTransports();

    }



    @Override
@@ -754,7 +817,18 @@ public class Trampoline extends IBackupManager.Stub { 
    @Override

    public ComponentName[] listAllTransportComponentsForUser(int userId) throws RemoteException {

        return (isUserReadyForBackup(userId))

                ? mService.listAllTransportComponents(userId) : null;

                ? listAllTransportComponents(userId) : null;

    }



    /** Report all known, available backup transports by {@link ComponentName}. */

    @Nullable

    public ComponentName[] listAllTransportComponents(@UserIdInt int userId) {

        UserBackupManagerService userBackupManagerService =

                getServiceForUserIfCallerHasPermission(userId, "listAllTransportComponents()");



        return userBackupManagerService == null

                ? null

                : userBackupManagerService.listAllTransportComponents();

    }



    @Override

services/robotests/backup/src/com/android/server/backup/BackupManagerServiceTest.java

+0 −150
Original line number Diff line number Diff line
@@ -224,156 +224,6 @@ public class BackupManagerServiceTest { 
    // Transport tests

    // ---------------------------------------------



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testInitializeTransports_onRegisteredUser_callsMethodForUser() throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);

        String[] transports = {TEST_TRANSPORT};



        backupManagerService.initializeTransports(mUserOneId, transports, /* observer */ null);



        verify(mUserOneService).initializeTransports(transports, /* observer */ null);

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testInitializeTransports_onUnknownUser_doesNotPropagateCall() throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);

        String[] transports = {TEST_TRANSPORT};



        backupManagerService.initializeTransports(mUserTwoId, transports, /* observer */ null);



        verify(mUserOneService, never()).initializeTransports(transports, /* observer */ null);

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testClearBackupData_onRegisteredUser_callsMethodForUser() throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.clearBackupData(mUserOneId, TEST_TRANSPORT, TEST_PACKAGE);



        verify(mUserOneService).clearBackupData(TEST_TRANSPORT, TEST_PACKAGE);

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testClearBackupData_onUnknownUser_doesNotPropagateCall() throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.clearBackupData(mUserTwoId, TEST_TRANSPORT, TEST_PACKAGE);



        verify(mUserOneService, never()).clearBackupData(TEST_TRANSPORT, TEST_PACKAGE);

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testGetCurrentTransport_onRegisteredUser_callsMethodForUser() throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.getCurrentTransport(mUserOneId);



        verify(mUserOneService).getCurrentTransport();

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testGetCurrentTransport_onUnknownUser_doesNotPropagateCall() throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.getCurrentTransport(mUserTwoId);



        verify(mUserOneService, never()).getCurrentTransport();

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testGetCurrentTransportComponent_onRegisteredUser_callsMethodForUser()

            throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.getCurrentTransportComponent(mUserOneId);



        verify(mUserOneService).getCurrentTransportComponent();

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testGetCurrentTransportComponent_onUnknownUser_doesNotPropagateCall()

            throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.getCurrentTransportComponent(mUserTwoId);



        verify(mUserOneService, never()).getCurrentTransportComponent();

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testListAllTransports_onRegisteredUser_callsMethodForUser() throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.listAllTransports(mUserOneId);



        verify(mUserOneService).listAllTransports();

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testListAllTransports_onUnknownUser_doesNotPropagateCall() throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.listAllTransports(mUserTwoId);



        verify(mUserOneService, never()).listAllTransports();

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testListAllTransportComponents_onRegisteredUser_callsMethodForUser()

            throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.listAllTransportComponents(mUserOneId);



        verify(mUserOneService).listAllTransportComponents();

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testListAllTransportComponents_onUnknownUser_doesNotPropagateCall()

            throws Exception {

        registerUser(mUserOneId, mUserOneService);

        BackupManagerService backupManagerService = createService();

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.listAllTransportComponents(mUserTwoId);



        verify(mUserOneService, never()).listAllTransportComponents();

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testUpdateTransportAttributes_onRegisteredUser_callsMethodForUser()

services/robotests/backup/src/com/android/server/backup/TrampolineRoboTest.java

+155 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import org.robolectric.shadows.ShadowContextWrapper; 
@Presubmit

public class TrampolineRoboTest {

    private static final String TEST_PACKAGE = "package";

    private static final String TEST_TRANSPORT = "transport";



    private Context mContext;

    private ShadowContextWrapper mShadowContext;
@@ -243,6 +244,160 @@ public class TrampolineRoboTest { 
        verify(mUserOneService, never()).opComplete(/* token */ 0, /* result */ 0L);

    }



    // ---------------------------------------------

    // Transport tests

    // ---------------------------------------------



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testInitializeTransports_onRegisteredUser_callsMethodForUser() throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);

        String[] transports = {TEST_TRANSPORT};



        backupManagerService.initializeTransports(mUserOneId, transports, /* observer */ null);



        verify(mUserOneService).initializeTransports(transports, /* observer */ null);

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testInitializeTransports_onUnknownUser_doesNotPropagateCall() throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);

        String[] transports = {TEST_TRANSPORT};



        backupManagerService.initializeTransports(mUserTwoId, transports, /* observer */ null);



        verify(mUserOneService, never()).initializeTransports(transports, /* observer */ null);

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testClearBackupData_onRegisteredUser_callsMethodForUser() throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.clearBackupData(mUserOneId, TEST_TRANSPORT, TEST_PACKAGE);



        verify(mUserOneService).clearBackupData(TEST_TRANSPORT, TEST_PACKAGE);

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testClearBackupData_onUnknownUser_doesNotPropagateCall() throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.clearBackupData(mUserTwoId, TEST_TRANSPORT, TEST_PACKAGE);



        verify(mUserOneService, never()).clearBackupData(TEST_TRANSPORT, TEST_PACKAGE);

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testGetCurrentTransport_onRegisteredUser_callsMethodForUser() throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.getCurrentTransport(mUserOneId);



        verify(mUserOneService).getCurrentTransport();

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testGetCurrentTransport_onUnknownUser_doesNotPropagateCall() throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.getCurrentTransport(mUserTwoId);



        verify(mUserOneService, never()).getCurrentTransport();

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testGetCurrentTransportComponent_onRegisteredUser_callsMethodForUser()

            throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.getCurrentTransportComponent(mUserOneId);



        verify(mUserOneService).getCurrentTransportComponent();

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testGetCurrentTransportComponent_onUnknownUser_doesNotPropagateCall()

            throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.getCurrentTransportComponent(mUserTwoId);



        verify(mUserOneService, never()).getCurrentTransportComponent();

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testListAllTransports_onRegisteredUser_callsMethodForUser() throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.listAllTransports(mUserOneId);



        verify(mUserOneService).listAllTransports();

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testListAllTransports_onUnknownUser_doesNotPropagateCall() throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.listAllTransports(mUserTwoId);



        verify(mUserOneService, never()).listAllTransports();

    }



    /** Test that the backup service routes methods correctly to the user that requests it. */

    @Test

    public void testListAllTransportComponents_onRegisteredUser_callsMethodForUser()

            throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserOneId, /* shouldGrantPermission */ false);



        backupManagerService.listAllTransportComponents(mUserOneId);



        verify(mUserOneService).listAllTransportComponents();

    }



    /** Test that the backup service does not route methods for non-registered users. */

    @Test

    public void testListAllTransportComponents_onUnknownUser_doesNotPropagateCall()

            throws Exception {

        Trampoline backupManagerService = createService();

        registerUser(backupManagerService, mUserOneId, mUserOneService);

        setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);



        backupManagerService.listAllTransportComponents(mUserTwoId);



        verify(mUserOneService, never()).listAllTransportComponents();

    }



    private Trampoline createService() {

        return new Trampoline(mContext);

    }

services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java

+0 −61

File changed.

Preview size limit exceeded, changes collapsed.