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

Commit 44b8e043 authored by Shaowei Shen's avatar Shaowei Shen Committed by android-build-merger
Browse files

Merge "Fix [kv-3]PerformBackupTask using last package status to decide status... 

Merge "Fix [kv-3]PerformBackupTask using last package status to decide status sent to IBackupObserver." into pi-dev am: 49a987c2
am: 661afbe5

Change-Id: Ia242afee49f7c715ba0b6fa65a4325b89e26f79d
parents 81c93309 661afbe5

services/backup/java/com/android/server/backup/internal/PerformBackupTask.java

+2 −0
Original line number Diff line number Diff line
@@ -616,6 +616,8 @@ public class PerformBackupTask implements BackupRestoreTask { 
            mFullBackupTask.unregisterTask();

            switch (mStatus) {

                case BackupTransport.TRANSPORT_OK:

                case BackupTransport.TRANSPORT_QUOTA_EXCEEDED:

                case BackupTransport.TRANSPORT_PACKAGE_REJECTED:

                    BackupObserverUtils.sendBackupFinished(mObserver,

                            BackupManager.SUCCESS);

                    break;

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

+3 −4
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ public class PerformBackupTaskTest { 
        runTask(task);



        verify(mObserver).onResult(PACKAGE_1, BackupManager.ERROR_TRANSPORT_PACKAGE_REJECTED);

        verify(mObserver).backupFinished(BackupManager.ERROR_TRANSPORT_ABORTED);

        verify(mObserver).backupFinished(BackupManager.SUCCESS);

    }



    @Test
@@ -441,8 +441,7 @@ public class PerformBackupTaskTest { 


        verify(mObserver).onResult(PACKAGE_1, BackupManager.SUCCESS);

        verify(mObserver).onResult(PACKAGE_2, BackupManager.ERROR_TRANSPORT_PACKAGE_REJECTED);

        // TODO: Should we return the status of the last?

        verify(mObserver).backupFinished(BackupManager.ERROR_TRANSPORT_ABORTED);

        verify(mObserver).backupFinished(BackupManager.SUCCESS);

    }



    @Test
@@ -459,7 +458,7 @@ public class PerformBackupTaskTest { 
        runTask(task);



        verify(mObserver).onResult(PACKAGE_1, BackupManager.ERROR_TRANSPORT_QUOTA_EXCEEDED);

        verify(mObserver).backupFinished(BackupManager.ERROR_TRANSPORT_ABORTED);

        verify(mObserver).backupFinished(BackupManager.SUCCESS);

        verify(agentMock.agent).onQuotaExceeded(anyLong(), anyLong());

    }