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

Commit fb887a69 authored by Anton Philippov's avatar Anton Philippov
Browse files

Pass an empty list to PerformBackupTask constructor instead of null 

Recent changes to PerformBackupTask made it expect empty list rather
than null for the ArrayList<String> pendingFullBackups argument.

Bug: 35420596
Test: manual
Change-Id: I8e1f69e78856b9bb8fc8aa9ab1adcac634314a36
parent a6d6e60e

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

+6 −4
Original line number Diff line number Diff line
@@ -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;