Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disallow parallel backups"

Browse Source
This commit is contained in:
Shreyas Basarge
2017-02-23 18:27:21 +00:00
committed by Android (Google) Code Review
parent 6a4b9a33dc aac009b0f5
commit ba9e399ffd
1 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -2682,19 +2682,32 @@ public class BackupManagerService {
mStateDir = new File(mBaseStateDir, dirName);
mCurrentOpToken = generateToken();
mCurrentState = BackupState.INITIAL;
mFinished = false;
CountDownLatch latch = new CountDownLatch(1);
String[] fullBackups =
mPendingFullBackups.toArray(new String[mPendingFullBackups.size()]);
mFullBackupTask =
new PerformFullTransportBackupTask(/*fullBackupRestoreObserver*/ null,
fullBackups, /*updateSchedule*/ false, /*runningJob*/ null, latch,
mObserver, mMonitor,mUserInitiated);
synchronized (mCurrentOpLock) {
if (isBackupOperationInProgress()) {
if (DEBUG) {
Slog.d(TAG, "Skipping backup since one is already in progress.");
}
mCancelAll = true;
mFullBackupTask = null;
mCurrentState = BackupState.FINAL;
addBackupTrace("Skipped. Backup already in progress.");
} else {
mCurrentState = BackupState.INITIAL;
CountDownLatch latch = new CountDownLatch(1);
String[] fullBackups =
mPendingFullBackups.toArray(new String[mPendingFullBackups.size()]);
mFullBackupTask =
new PerformFullTransportBackupTask(/*fullBackupRestoreObserver*/ null,
fullBackups, /*updateSchedule*/ false, /*runningJob*/ null,
latch,
mObserver, mMonitor, mUserInitiated);
registerTask();
addBackupTrace("STATE => INITIAL");
registerTask();
addBackupTrace("STATE => INITIAL");
}
}
}
/**
@@ -3077,7 +3090,9 @@ public class BackupManagerService {
mWakelock.acquire();
(new Thread(mFullBackupTask, "full-transport-requested")).start();
} else if (mCancelAll) {
mFullBackupTask.unregisterTask();
if (mFullBackupTask != null) {
mFullBackupTask.unregisterTask();
}
sendBackupFinished(mObserver, BackupManager.ERROR_BACKUP_CANCELLED);
} else {
mFullBackupTask.unregisterTask();
@@ -3561,6 +3576,18 @@ public class BackupManagerService {
}
}
private boolean isBackupOperationInProgress() {
synchronized (mCurrentOpLock) {
for (int i = 0; i < mCurrentOperations.size(); i++) {
Operation op = mCurrentOperations.valueAt(i);
if (op.type == OP_TYPE_BACKUP && op.state == OP_PENDING) {
return true;
}
}
}
return false;
}
// ----- Full backup/restore to a file/socket -----
@@ -4543,6 +4570,14 @@ public class BackupManagerService {
mCurrentOpToken = generateToken();
mBackupRunnerOpToken = generateToken();
if (isBackupOperationInProgress()) {
if (DEBUG) {
Slog.d(TAG, "Skipping full backup. A backup is already in progress.");
}
mCancelAll = true;
return;
}
registerTask();
for (String pkg : whichPackages) {