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

Commit 49a987c2 authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
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
parents 63b6275a 59ab5f49

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

+2 −0
Original line number Diff line number Diff line
@@ -629,6 +629,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
@@ -419,7 +419,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
@@ -467,8 +467,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
@@ -488,7 +487,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());

    }