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

Commit 9d395bb3 authored by Michal Karpinski's avatar Michal Karpinski
Browse files

[RefactoredBMS] Tear down agent after preflight rejection 

This CL replicates ag/2520584d in RefactoredBMS.

Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: I13ac110dbc197df473dd6a0cf24866133dfefab8
parent fcd615fa

services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java

+10 −1
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba 
            final int N = mPackages.size();

            final byte[] buffer = new byte[8192];

            for (int i = 0; i < N; i++) {

                mBackupRunner = null;

                PackageInfo currentPackage = mPackages.get(i);

                String packageName = currentPackage.packageName;

                if (DEBUG) {
@@ -491,7 +492,13 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba 
                    }

                    EventLog.writeEvent(EventLogTags.FULL_BACKUP_AGENT_FAILURE, packageName,

                            "transport rejected");

                    // Do nothing, clean up, and continue looping.

                    // This failure state can come either a-priori from the transport, or

                    // from the preflight pass.  If we got as far as preflight, we now need

                    // to tear down the target process.

                    if (mBackupRunner != null) {

                        backupManagerService.tearDownAgentAndKill(currentPackage.applicationInfo);

                    }

                    // ... and continue looping.

                } else if (backupPackageStatus == BackupTransport.TRANSPORT_QUOTA_EXCEEDED) {

                    BackupObserverUtils

                            .sendBackupOnPackageResult(mBackupObserver, packageName,
@@ -501,6 +508,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba 
                        EventLog.writeEvent(EventLogTags.FULL_BACKUP_QUOTA_EXCEEDED,

                                packageName);

                    }

                    backupManagerService.tearDownAgentAndKill(currentPackage.applicationInfo);

                    // Do nothing, clean up, and continue looping.

                } else if (backupPackageStatus == BackupTransport.AGENT_ERROR) {

                    BackupObserverUtils
@@ -527,6 +535,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba 
                    EventLog.writeEvent(EventLogTags.FULL_BACKUP_TRANSPORT_FAILURE);

                    // Abort entire backup pass.

                    backupRunStatus = BackupManager.ERROR_TRANSPORT_ABORTED;

                    backupManagerService.tearDownAgentAndKill(currentPackage.applicationInfo);

                    return;

                } else {

                    // Success!