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

Commit 2863ea6c authored by Annie Meng's avatar Annie Meng
Browse files

[Multi-user] Clean up BMS structure 

Part of preparation to extract out user BMS.

Remove unused components:
- Backup traces
- Unused fields

Clean-up work:
- Better organize BMS class structure to be able to separate global vs.
user state. This is purely a move and no functionality has changed:
> static fields, static methods, instance fields, constructor, methods,
private static methods, static inner class (system service definition).
- Add javadoc comments to comply with new checkstyle preupload hook.

Bug: 118520567
Test: 1) atest RunFrameworksServicesRoboTests
2) atest FrameworksServicesTests

Change-Id: I5ac868ff0df0ec007b64d686647d9a676e374e40
parent 13638940

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

+409 −445

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −3
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ import com.android.internal.backup.IBackupTransport; 
import com.android.internal.util.Preconditions;

import com.android.server.EventLogTags;

import com.android.server.backup.BackupAgentTimeoutParameters;

import com.android.server.backup.BackupManagerService;

import com.android.server.backup.BackupRestoreTask;

import com.android.server.backup.FullBackupJob;

import com.android.server.backup.BackupManagerService;

import com.android.server.backup.TransportManager;

import com.android.server.backup.internal.OnTaskFinishedListener;

import com.android.server.backup.internal.Operation;
@@ -599,7 +599,6 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba 
                cleanUpPipes(enginePipes);

                if (currentPackage.applicationInfo != null) {

                    Slog.i(TAG, "Unbinding agent in " + packageName);

                    backupManagerService.addBackupTrace("unbinding " + packageName);

                    try {

                        backupManagerService.getActivityManager().unbindBackupAgent(

                                currentPackage.applicationInfo);
@@ -709,7 +708,6 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba 
            try {

                backupManagerService.prepareOperationTimeout(

                        mCurrentOpToken, fullBackupAgentTimeoutMillis, this, OP_TYPE_BACKUP_WAIT);

                backupManagerService.addBackupTrace("preflighting");

                if (MORE_DEBUG) {

                    Slog.d(TAG, "Preflighting full payload of " + pkg.packageName);

                }