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

Merge "Pass an empty list to PerformBackupTask constructor instead of null"

Browse Source
This commit is contained in:
Anton Philippov
2017-03-06 10:25:22 +00:00
committed by Android (Google) Code Review
parent 4c368d5502 fb887a69b6
commit 1363ab3d7b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -856,13 +856,15 @@ public class BackupManagerService {
try {
String dirName = transport.transportDirName();
PerformBackupTask pbt = new PerformBackupTask(transport, dirName, queue,
oldJournal, null, null, null, false, false /* nonIncremental */);
oldJournal, null, null, Collections.<String>emptyList(), false,
false /* nonIncremental */);
Message pbtMessage = obtainMessage(MSG_BACKUP_RESTORE_STEP, pbt);
sendMessage(pbtMessage);
} catch (Exception e) {
// unable to ask the transport its dir name -- transient failure, since
// the above check succeeded. Try again next time.
Slog.e(TAG, "Transport became unavailable attempting backup");
Slog.e(TAG, "Transport became unavailable attempting backup"
+ " or error initializing backup task", e);
staged = false;
}
} else {
@@ -2657,7 +2659,7 @@ public class BackupManagerService {
File mStateDir;
File mJournal;
BackupState mCurrentState;
ArrayList<String> mPendingFullBackups;
List<String> mPendingFullBackups;
IBackupObserver mObserver;
IBackupManagerMonitor mMonitor;
@@ -2683,7 +2685,7 @@ public class BackupManagerService {
public PerformBackupTask(IBackupTransport transport, String dirName,
ArrayList<BackupRequest> queue, File journal, IBackupObserver observer,
IBackupManagerMonitor monitor, ArrayList<String> pendingFullBackups,
IBackupManagerMonitor monitor, List<String> pendingFullBackups,
boolean userInitiated, boolean nonIncremental) {
mTransport = transport;
mOriginalQueue = queue;